RPM Packaging: remove obsolete patches

4 files changed, 0 insertions, 405 deletions

diff --git a/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch b/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch
deleted file mode 100644
index ac0716353..000000000
--- a/redhat/applications/k9copy/k9copy-14.0.0-use_external_dvdread.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- ./k9author/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9author/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -14,5 +14,5 @@
- 	k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
- 	k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
- libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_TDEUI)
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
- 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
---- ./k9decmpeg/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9decmpeg/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -12,7 +12,7 @@
- 	motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
- 	mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
- 	uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
- 	-I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
- 
- noinst_HEADERS = k9decodethread.h k9plaympeg2.h
---- ./k9devices/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9devices/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
- 	$(HAL_INCS) $(K3B_INCS) -I$(includedir) $(all_includes)
- METASOURCES = AUTO
- libk9devices_la_LDFLAGS = $(all_libraries) 
---- ./k9Mplayer/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9Mplayer/Makefile.am	2013-07-28 20:05:20.857621477 +0200
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
- METASOURCES = AUTO
- 
- noinst_LTLIBRARIES = libk9mplayer.la
---- ./k9vamps/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./k9vamps/Makefile.am	2013-07-28 20:05:20.858621351 +0200
-@@ -7,6 +7,6 @@
- noinst_LTLIBRARIES = libk9vamps.la
- libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
- 	k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
- 	-I$(top_srcdir)/libk9copy
- noinst_HEADERS = k9requant.h ac.h k9fifo.h
---- ./libdvdnav/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./libdvdnav/Makefile.am	2013-07-28 20:05:20.858621351 +0200
-@@ -11,4 +11,4 @@
- 
- 
- 
--INCLUDES = -I$(top_srcdir)/dvdread
-+INCLUDES = -I/usr/include/dvdread
---- ./libk9copy/Makefile.am.dvdread	2013-06-06 19:29:20.000000000 +0200
-+++ ./libk9copy/Makefile.am	2013-07-28 20:05:20.858621351 +0200
-@@ -24,6 +24,6 @@
- 	k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
- 
- 
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
- 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
- libk9copy_la_LDFLAGS = $(all_libraries)
---- ./Makefile.am.ORI	2013-07-28 20:15:29.961786846 +0200
-+++ ./Makefile.am	2013-07-28 20:15:43.375094511 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps  \
-+SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps  \
- 	 po src
- 
- $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-@@ -29,11 +29,3 @@
- 
- AM_CXXFLAGS = -O0 -g3
- 
--
--
--
--
--
--
--
--INCLUDES = -I$(top_srcdir)/dvdread
---- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.dvdread	2013-08-02 11:01:48.000000000 +0200
-+++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am	2013-08-02 11:03:44.081175118 +0200
-@@ -1,5 +1,5 @@
- # set the include path for X, qt and KDE
--INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
-+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
- 	-I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
- 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy -I$(includedir) $(all_includes)
- 
-@@ -35,7 +35,7 @@
- 	$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
- 	$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
- 	$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
--	$(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
-+	-ldvdread $(LIB_TDEUI) -ltdemdi $(LIBDL) -lk3b -lk3bdevice
- 
- # this is where the desktop file will go 
- shelldesktopdir = $(kde_appsdir)/Utilities
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec
deleted file mode 100644
index 3bb4deca1..000000000
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.12.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-Name:		trinity-libcarddav
-Version:	0.6.2
-Release:	3%{?dist}%{?_variant}
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-License:	GPL
-Group:		System Environment/Libraries
-Summary:	A portable CardDAV client implementation originally developed for the Trinity PIM suite.
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	libcarddav_0.6.2-2debian2.tar.gz
-
-# [libcarddav] Fix messy installation directories
-Patch1:		libcarddav-0.6.5-fix_installation.patch
-
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-BuildRequires:	libcurl-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}curl-devel
-%else
-# Specific CURL version for TDE on RHEL 5 (and older)
-BuildRequires:	trinity-libcurl-devel
-%endif
-%endif
-
-%if 0%{?rhel} == 4
-BuildRequires:	evolution28-gtk2-devel
-%else
-BuildRequires:	glib2-devel
-BuildRequires:	gtk2-devel
-%endif
-BuildRequires:	make
-
-Obsoletes:	libcarddav < %{version}-%{release}
-Provides:	libcarddav = %{version}-%{release}
-
-%description
-Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
-It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. 
-Build dependencies are minimal, requiring only libcurl.
-
-%package devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name}
-
-Obsoletes:	libcarddav-devel < %{version}-%{release}
-Provides:	libcarddav-devel = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n libcarddav-%{version}
-%patch1 -p1 -b .dir
-
-%build
-# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
-export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-if [ -d /usr/evolution28 ]; then
-  export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
-fi
-
-autoreconf --force --install --symlink
-%configure \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
-  
-%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
-
-%install
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
-
-%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_libdir}/pkgconfig/libcarddav.pc
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
-
-%Changelog
-* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
-- Renames to 'trinity-libcaldav'
-- Build on MGA2
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
-- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch
deleted file mode 100644
index 38c729d60..000000000
--- a/redhat/dependencies/tqt3/tqt3-14.0.0-fix_ftbfs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./tools/qvfb/qanimationwriter.cpp.ori	2013-06-25 20:52:34.636153035 +0200
-+++ ./tools/qvfb/qanimationwriter.cpp	2013-06-25 20:52:59.673642835 +0200
-@@ -101,7 +101,15 @@
- 
-     void writePNG(const TQImage& image)
-     {
-+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
-+#warning XXXtnn not too sure about this
-+/* 
-+according to png.h, channels is only used on read, not writes, so we
-+should be able to comment this out.
-+*/
-+#else /* LIBPNG 1.5 */
- 	info_ptr->channels = 4;
-+#endif
- 	png_set_sig_bytes(png_ptr, 8); // Pretend we already wrote the sig
- 	png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
- 	    8, image.hasAlphaBuffer()
diff --git a/redhat/tdelibs/tdelibs-14.0.0-devkitpower_support.patch b/redhat/tdelibs/tdelibs-14.0.0-devkitpower_support.patch
deleted file mode 100644
index 055cac6a8..000000000
--- a/redhat/tdelibs/tdelibs-14.0.0-devkitpower_support.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- tdelibs/CMakeLists.txt.OR	2013-07-24 10:36:44.409135030 +0200
-+++ tdelibs/CMakeLists.txt	2013-07-24 10:37:09.619389250 +0200
-@@ -83,6 +83,7 @@
- OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
- OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
- OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
-+option( WITH_DEVKITPOWER "Enable DevKit Power support" OFF )
- option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )
- option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )
- option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )
---- tdelibs/tdecore/CMakeLists.txt.ORI	2013-07-24 10:40:06.480153460 +0200
-+++ tdelibs/tdecore/CMakeLists.txt	2013-07-24 10:40:38.037254501 +0200
-@@ -21,6 +21,13 @@
- 
- if( WITH_UPOWER )
-   add_definitions( -DWITH_UPOWER )
-+endif ( )
-+
-+if( WITH_DEVKITPOWER )
-+  add_definitions( -DWITH_DEVKITPOWER )
-+endif ( )
-+
-+if( WITH_UPOWER OR WITH_DEVKITPOWER )
-   set ( TDEUPOWER_INCLUDE_DIRECTORIES
-     ${DBUS_TQT_INCLUDE_DIRS}
-   )
---- tdelibs/tdecore/tdehardwaredevices.cpp.ORI	2013-07-24 10:42:27.499248218 +0200
-+++ tdelibs/tdecore/tdehardwaredevices.cpp	2013-07-24 10:55:02.895355871 +0200
-@@ -70,13 +70,13 @@
- #endif // WITH_NETWORK_MANAGER_BACKEND
- 
- // uPower and uDisks2 integration
--#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2)
-+#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_DEVKITPOWER)
- 	#include <tqdbusdata.h>
- 	#include <tqdbusmessage.h>
- 	#include <tqdbusproxy.h>
- 	#include <tqdbusvariant.h>
- 	#include <tqdbusconnection.h>
--#endif // defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2)
-+#endif // defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_DEVKITPOWER)
- #if defined(WITH_UDISKS) || defined(WITH_UDISKS2)
- 	#include <tqdbuserror.h>
- 	#include <tqdbusdatamap.h>
-@@ -85,6 +85,14 @@
- #if defined(WITH_UDISKS)
- 	#include "tqdbusdatalist.h"
- #endif // ddefined(WITH_UDISKS)
-+#ifdef WITH_DEVKITPOWER
-+#define DBUS_POWER_CONNECTION_NAME "org.freedesktop.DeviceKit.Power"
-+#define DBUS_POWER_OBJECT_PATH "/org/freedesktop/DeviceKit/Power"
-+#endif // WITH_DEVKITPOWER
-+#ifdef WITH_UPOWER
-+#define DBUS_POWER_CONNECTION_NAME "org.freedesktop.UPower"
-+#define DBUS_POWER_OBJECT_PATH "/org/freedesktop/UPower"
-+#endif // WITH_UPOWER
- 
- // BEGIN BLOCK
- // Copied from include/linux/genhd.h
-@@ -1364,10 +1372,10 @@
- 		}
- 	}
- 	else {
--#ifdef WITH_UPOWER
-+#if defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
- 		if (dbusConn.isConnected()) {
--			TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn);
-+			TQT_DBusProxy upowerProperties(DBUS_POWER_CONNECTION_NAME, DBUS_POWER_OBJECT_PATH, "org.freedesktop.DBus.Properties", dbusConn);
- 			if (upowerProperties.canSend()) {
- 				// can suspend?
- 				TQValueList<TQT_DBusData> params;
-@@ -1387,9 +1395,9 @@
- 		else {
- 			return FALSE;
- 		}
--#else // WITH_UPOWER
-+#else // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 		return FALSE;
--#endif// WITH_UPOWER
-+#endif// defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 	}
- }
- 
-@@ -1405,10 +1413,10 @@
- 		}
- 	}
- 	else {
--#ifdef WITH_UPOWER
-+#if defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
- 		if (dbusConn.isConnected()) {
--			TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn);
-+			TQT_DBusProxy upowerProperties(DBUS_POWER_CONNECTION_NAME, DBUS_POWER_OBJECT_PATH, "org.freedesktop.DBus.Properties", dbusConn);
- 			if (upowerProperties.canSend()) {
- 				// can hibernate?
- 				TQValueList<TQT_DBusData> params;
-@@ -1428,9 +1436,9 @@
- 		else {
- 			return FALSE;
- 		}
--#else // WITH_UPOWER
-+#else // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 		return FALSE;
--#endif// WITH_UPOWER
-+#endif// defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 	}
- }
- 
-@@ -1565,24 +1573,24 @@
- 			return true;
- 		}
- 		else {
--#ifdef WITH_UPOWER
-+#if defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 			TQT_DBusConnection dbusConn;
- 			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
- 			if ( dbusConn.isConnected() ) {
- 				if (ps == TDESystemPowerState::Suspend) {
- 					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
--								"org.freedesktop.UPower",
--								"/org/freedesktop/UPower",
--								"org.freedesktop.UPower",
-+								DBUS_POWER_CONNECTION_NAME,
-+								DBUS_POWER_OBJECT_PATH,
-+								DBUS_POWER_CONNECTION_NAME,
- 								"Suspend");
- 					dbusConn.sendWithReply(msg);
- 					return true;
- 				}
- 				else if (ps == TDESystemPowerState::Hibernate) {
- 					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
--								"org.freedesktop.UPower",
--								"/org/freedesktop/UPower",
--								"org.freedesktop.UPower",
-+								DBUS_POWER_CONNECTION_NAME,
-+								DBUS_POWER_OBJECT_PATH,
-+								DBUS_POWER_CONNECTION_NAME,
- 								"Hibernate");
- 					dbusConn.sendWithReply(msg);
- 					return true;
-@@ -1594,9 +1602,9 @@
- 			else {
- 				return false;
- 			}
--#else // WITH_UPOWER
-+#else // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 			return false;
--#endif // WITH_UPOWER
-+#endif // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER)
- 		}
- 	}
- 	else if (ps == TDESystemPowerState::PowerOff) {