diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:16:34 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:16:34 +0000 |
commit | 1469a8d9fa32231e504d0d3f406f4f10b638a220 (patch) | |
tree | 3351263aceaaf05555e0a4c5f69fcd322c2d461d /kde-base/kcontrol | |
parent | Remove unneeded patches. (diff) | |
download | gentoo-2-1469a8d9fa32231e504d0d3f406f4f10b638a220.tar.gz gentoo-2-1469a8d9fa32231e504d0d3f406f4f10b638a220.tar.bz2 gentoo-2-1469a8d9fa32231e504d0d3f406f4f10b638a220.zip |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base/kcontrol')
4 files changed, 7 insertions, 111 deletions
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog index 70106c7df92e..f98d8493dbeb 100644 --- a/kde-base/kcontrol/ChangeLog +++ b/kde-base/kcontrol/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kcontrol # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.82 2007/02/04 01:51:29 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.83 2007/02/05 12:16:34 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/kdebase-3.4.1-configure.patch, + -files/kdebase-3.4.2-kinfocenter-opengl-fix.patch, + -files/configure.in.in-kdm-settings.diff: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kcontrol-3.5.2.ebuild: Remove old versions. diff --git a/kde-base/kcontrol/files/configure.in.in-kdm-settings.diff b/kde-base/kcontrol/files/configure.in.in-kdm-settings.diff deleted file mode 100644 index 312a4f28db82..000000000000 --- a/kde-base/kcontrol/files/configure.in.in-kdm-settings.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- /dev/null 2004-10-20 22:28:31.361557664 +0200 -+++ kcontrol/configure.in.in 2004-10-10 16:37:14.000000000 +0200 -@@ -0,0 +1,11 @@ -+dnl Taken from kdebase/kdm/configure.in.in to create kdebase/kcontrol/configure.in.in -+dnl when kcontrol is compiled without kdm being in the source tree -+ -+KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir) -+AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory]) -+KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir) -+AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory]) -+KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir) -+AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory]) -+AC_SUBST(KDE_BINDIR) -+ diff --git a/kde-base/kcontrol/files/kdebase-3.4.1-configure.patch b/kde-base/kcontrol/files/kdebase-3.4.1-configure.patch deleted file mode 100644 index 319a96702b3d..000000000000 --- a/kde-base/kcontrol/files/kdebase-3.4.1-configure.patch +++ /dev/null @@ -1,84 +0,0 @@ -Index: kcontrol/input/configure.in.bot -=================================================================== ---- kcontrol/input/configure.in.bot (revision 420060) -+++ kcontrol/input/configure.in.bot (working copy) -@@ -1,10 +1,4 @@ --if test "$LUSBLIB" = "no"; then -- echo -- echo " Problem! libusb library not found, get it from" -- echo " http://libusb.sourceforge.net" --fi -- --if (test x"$USB_LIBS" = x""); then -+if test "x$with_libusb" = xcheck && test "x$have_libusb" = xno; then - echo "" - echo "Logitech mouse support is disabled. Provide libusb to enable it." - echo "" -Index: kcontrol/input/configure.in.in -=================================================================== ---- kcontrol/input/configure.in.in (revision 420060) -+++ kcontrol/input/configure.in.in (working copy) -@@ -1,19 +1,26 @@ --LIBUSBCONFIG="" --AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no) --if test $LIBUSBCONFIG = "no" ; then -- AC_MSG_WARN(Can't find libusb-config) -- AC_MSG_WARN(Check your libusb installation) -- USB_LIBS="" -- USB_CFLAGS="" --else -- USB_LIBS="$($LIBUSBCONFIG --libs)" -- USB_CFLAGS="$($LIBUSBCONFIG --cflags)" --AC_CHECK_LIB(usb,main, -- AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb]), -- [], -- $USB_LIBS --) -+AC_ARG_WITH(libusb, -+ [AS_HELP_STRING(--with-libusb, -+ [enable control of some mouse models through libusb @<:@default=check@:>@])], -+ [], with_libusb=check) -+ -+USB_LIBS= -+USB_CFLAGS= -+have_libusb=no -+if test "x$with_libusb" != xno; then -+ AC_PATH_PROG(LIBUSBCONFIG,libusb-config,no) -+ if test $LIBUSBCONFIG != "no"; then -+ USB_LIBS="$($LIBUSBCONFIG --libs)" -+ USB_CFLAGS="$($LIBUSBCONFIG --cflags)" -+ -+ AC_CHECK_LIB(usb,main, -+ [have_libusb=yes -+ AC_DEFINE(HAVE_LIBUSB, 1, [Defined if you have libusb])], -+ [], [$USB_LIBS] -+ ) -+ fi -+ if test "x$with_libusb" != xcheck && test "x$have_libusb" = xno; then -+ AC_MSG_FAILURE([--with-libusb was given, but test for libusb failed]) -+ fi - fi - AC_SUBST(USB_LIBS) - AC_SUBST(USB_CFLAGS) -- -Index: kcontrol/view1394/configure.in.in -=================================================================== ---- kcontrol/view1394/configure.in.in (revision 420060) -+++ kcontrol/view1394/configure.in.in (working copy) -@@ -1,3 +1,15 @@ -+AC_ARG_WITH(libraw1394, -+ [AS_HELP_STRING(--with-libraw1394, -+ [enable visualization of ieee1394 devices through libraw1394 @<:@default=check@:>@])], -+ [], with_libraw1394=check) -+ - VIEW1394_SUBDIR= --KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394) -+if test "x$with_libraw1394" != xno; then -+ KDE_CHECK_HEADER(libraw1394/raw1394.h, VIEW1394_SUBDIR=view1394) -+ -+ if test "x$with_libraw1394" != xcheck && test -z "$VIEW1394_SUBDIR"; then -+ AC_MSG_FAILURE([--with-libraw1394 was given, but test for libraw1394 failed]) -+ fi -+fi -+ - AM_CONDITIONAL(include_kcontrol_view1394, test -n "$VIEW1394_SUBDIR") diff --git a/kde-base/kcontrol/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch b/kde-base/kcontrol/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch deleted file mode 100644 index f18c216257ff..000000000000 --- a/kde-base/kcontrol/files/kdebase-3.4.2-kinfocenter-opengl-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- kcontrol/info/opengl.cpp.bak 2005-05-23 07:13:35.000000000 -0500 -+++ kcontrol/info/opengl.cpp 2005-08-27 10:45:08.000000000 -0500 -@@ -235,6 +235,9 @@ - GL_COMPRESSED_TEXTURE_FORMATS - */ - -+ if (!glExtensions) -+ return; -+ - struct token_name { - GLuint type; // count and flags, !!! count must be <=2 for now - GLenum token; |