# ChangeLog for net-misc/rdesktop
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.62 2005/07/27 18:53:51 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.63 2005/10/27 13:37:53 wolf31o2 Exp $
+
+ 27 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+ -files/rdesktop-1.3.1-kde.patch,
+ -files/rdesktop-1.4.0-configure-with_arg.patch, -rdesktop-1.3.1-r1.ebuild,
+ -rdesktop-1.4.0-r1.ebuild:
+ Cleaning up older ebuilds.
27 Jul 2005; Guy Martin <gmsoft@gentoo.org> rdesktop-1.4.1.ebuild:
Stable on hppa.
-MD5 48616830fa8024b95b4cdb042166552c ChangeLog 8431
+MD5 aeb5c5d1c57d4ab92547942c627b2ee2 ChangeLog 8658
+MD5 70717a72188f467d67a86be52598bdd5 files/digest-rdesktop-1.4.1 66
MD5 6c6c99858d7cd726a669b18be5e25ef3 metadata.xml 556
-MD5 e8ec9629caa0d0271830c94c56df7ff0 rdesktop-1.3.1-r1.ebuild 1190
-MD5 523e9b810345c3cd5fca0eb54db9ce85 rdesktop-1.4.0-r1.ebuild 1001
MD5 4500ee0fe545bc5e6dc2541a620be225 rdesktop-1.4.1.ebuild 851
-MD5 0af2b98117bd38ebe2c579b741d67e79 files/digest-rdesktop-1.4.0-r1 66
-MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1-r1 66
-MD5 a843f83ff14be3e87d5528c3c31416ed files/rdesktop-1.3.1-kde.patch 2409
-MD5 cc065e1d7df4180f2596bb76bff5aa8c files/rdesktop-1.4.0-configure-with_arg.patch 1744
-MD5 70717a72188f467d67a86be52598bdd5 files/digest-rdesktop-1.4.1 66
+++ /dev/null
-MD5 968a1e3f5161bab80c306df31c54cfb1 rdesktop-1.3.1.tar.gz 139686
+++ /dev/null
-MD5 542cb9d9b4dd1ecaf3ed4ff753fea7b8 rdesktop-1.4.0.tar.gz 202531
+++ /dev/null
---- rdesktop-1.3.1/rdesktop.c.orig 2004-03-08 18:02:58.000000000 +0100
-+++ rdesktop-1.3.1/rdesktop.c 2004-03-09 22:32:19.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <sys/time.h> /* gettimeofday */
- #include <sys/times.h> /* times */
- #include <errno.h>
-+#include <X11/Xlib.h> /* Window */
- #include "rdesktop.h"
-
- #ifdef EGD_SOCKET
-@@ -68,6 +69,7 @@
- BOOL g_console_session = False;
- BOOL g_numlock_sync = False;
- extern BOOL g_owncolmap;
-+extern Window g_embed_wnd;
-
- #ifdef WITH_RDPSND
- BOOL g_rdpsnd = False;
-@@ -112,6 +114,7 @@
- fprintf(stderr, " -S: caption button size (single application mode)\n");
- fprintf(stderr, " -T: window title\n");
- fprintf(stderr, " -N: enable numlock synchronisation\n");
-+ fprintf(stderr, " -X: embed into another window with a given id.\n");
- fprintf(stderr, " -a: connection colour depth\n");
- fprintf(stderr, " -r: enable specified device redirection (currently: sound)\n");
- fprintf(stderr, " -0: attach to console\n");
-@@ -224,6 +227,7 @@
- prompt_password = False;
- domain[0] = password[0] = shell[0] = directory[0] = 0;
- strcpy(keymapname, "en-us");
-+ g_embed_wnd = 0;
-
- #ifdef RDP2VNC
- #define VNCOPT "V:Q:"
-@@ -231,7 +235,7 @@
- #define VNCOPT
- #endif
-
-- while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1)
-+ while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:NX:a:r:045h?")) != -1)
- {
- switch (c)
- {
-@@ -374,6 +378,10 @@
- g_numlock_sync = True;
- break;
-
-+ case 'X':
-+ g_embed_wnd = strtod(optarg, NULL);
-+ break;
-+
- case 'a':
- g_server_bpp = strtol(optarg, NULL, 10);
- if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15
---- rdesktop-1.3.1/xwin.c.orig 2004-03-08 18:02:58.000000000 +0100
-+++ rdesktop-1.3.1/xwin.c 2004-03-10 16:17:59.000000000 +0100
-@@ -41,6 +41,7 @@
- static int g_x_socket;
- static Screen *g_screen;
- Window g_wnd;
-+Window g_embed_wnd;
- BOOL g_enable_compose = False;
- static GC g_gc;
- static BOOL g_gc_initialized = False;
-@@ -929,6 +930,11 @@
- XFree(sizehints);
- }
-
-+ if ( g_embed_wnd )
-+ {
-+ XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0);
-+ }
-+
- input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
- VisibilityChangeMask | FocusChangeMask;
-
+++ /dev/null
---- rdesktop-1.4.0/configure 2005-03-02 17:35:03.000000000 +0000
-+++ rdesktop-1.4.0-richard/configure 2005-04-11 13:07:30.964584294 +0100
-@@ -6679,10 +6718,15 @@
- # Check whether --with-ipv6 or --without-ipv6 was given.
- if test "${with_ipv6+set}" = set; then
- withval="$with_ipv6"
-- cat >>confdefs.h <<\_ACEOF
-+
-+ if test $withval != "no";
-+ then
-+ cat >>confdefs.h <<\_ACEOF
- #define IPv6 1
- _ACEOF
-
-+ fi
-+
- fi;
-
-
-@@ -6693,40 +6737,60 @@
- # Check whether --with-debug or --without-debug was given.
- if test "${with_debug+set}" = set; then
- withval="$with_debug"
-- cat >>confdefs.h <<\_ACEOF
-+
-+ if test $withval != "no";
-+ then
-+ cat >>confdefs.h <<\_ACEOF
- #define WITH_DEBUG 1
- _ACEOF
-
-+ fi
-+
- fi;
-
-
- # Check whether --with-debug-kbd or --without-debug-kbd was given.
- if test "${with_debug_kbd+set}" = set; then
- withval="$with_debug_kbd"
-- cat >>confdefs.h <<\_ACEOF
-+
-+ if test $withval != "no";
-+ then
-+ cat >>confdefs.h <<\_ACEOF
- #define WITH_DEBUG_KBD 1
- _ACEOF
-
-+ fi
-+
- fi;
-
-
- # Check whether --with-debug-rdp5 or --without-debug-rdp5 was given.
- if test "${with_debug_rdp5+set}" = set; then
- withval="$with_debug_rdp5"
-- cat >>confdefs.h <<\_ACEOF
-+
-+ if test $withval != "no";
-+ then
-+ cat >>confdefs.h <<\_ACEOF
- #define WITH_DEBUG_RDP5 1
- _ACEOF
-
-+ fi
-+
- fi;
-
-
- # Check whether --with-debug-clipboard or --without-debug-clipboard was given.
- if test "${with_debug_clipboard+set}" = set; then
- withval="$with_debug_clipboard"
-- cat >>confdefs.h <<\_ACEOF
-+
-+ if test $withval != "no";
-+ then
-+ cat >>confdefs.h <<\_ACEOF
- #define WITH_DEBUG_CLIPBOARD 1
- _ACEOF
-
-+ fi
-+
- fi;
-
-
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild,v 1.7 2005/01/20 11:36:55 gongloo Exp $
-
-inherit eutils
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ia64 ppc64 amd64 ppc-macos"
-IUSE="kde ssl debug"
-
-DEPEND="virtual/x11
- ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_unpack() {
- unpack ${A}
-
- # Apply KDE 3.3.0 compatibility patch from KDE CVS submitted to bug #58312
- # by Ronald Moesbergen <r.moesbergen@hccnet.nl>
- use kde && epatch ${FILESDIR}/${P}-kde.patch
-}
-
-src_compile() {
- local myconf
- use ssl \
- && myconf="--with-openssl=/usr/include/openssl" \
- || myconf="--without-openssl"
-
- sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --sharedir=/usr/share/${PN} \
- `use_with debug` \
- ${myconf} || die
-
- emake || die
-}
-
-src_install() {
- make DESTDIR=${D} install
- dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
-}
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.4.0-r1.ebuild,v 1.7 2005/06/11 06:48:00 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://rdesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc-macos ~ppc64 sparc x86"
-IUSE="debug ipv6 oss"
-
-DEPEND="virtual/x11
- >=dev-libs/openssl-0.9.6b"
-
-src_unpack() {
- unpack ${A}
- # Patch provided by Richard Brown <mynamewasgone@gmail.com> to bug #88684
- epatch ${FILESDIR}/${P}-configure-with_arg.patch
-}
-
-src_compile() {
- sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
- econf \
- --with-openssl=/usr \
- `use_with debug` \
- `use_with ipv6` \
- `use_with oss sound` \
- || die
-
- emake || die
-}
-
-src_install() {
- make DESTDIR=${D} install
- dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
-}
projects / gentoo.git / commitdiff