From 211ce4a54e04ece6ee31c2495abf6702ad83db6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 31 Aug 2013 15:41:39 +0200 Subject: [PATCH] RPM Packaging: remove obsolete patches --- .../tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch | 33 ----------- .../libtdeldap/libtdeldap-14.0.0-ftbfs.patch | 11 ---- ...python-trinity-14.0.0-tde_includedir.patch | 11 ---- ...k-14.0.0-fix_update_screensaver_list.patch | 57 ------------------- .../tdebindings-14.0.0-ftbfs.patch | 24 -------- 5 files changed, 136 deletions(-) delete mode 100644 redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch delete mode 100644 redhat/libraries/libtdeldap/libtdeldap-14.0.0-ftbfs.patch delete mode 100644 redhat/libraries/python-trinity/python-trinity-14.0.0-tde_includedir.patch delete mode 100644 redhat/tdeartwork/tdeartwork-14.0.0-fix_update_screensaver_list.patch delete mode 100644 redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch deleted file mode 100644 index b83b3f3ad..000000000 --- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200 -+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200 -@@ -143,10 +143,10 @@ - */ - - static const TQString -- html_form_begin("\n
\n" -+ html_form_begin_apt("\n\n" - "\n"); - static const TQString -- html_form_end("\n" -+ html_form_end_apt("\n" - "\t\n" - "\n" - "
\n" -@@ -197,7 +197,7 @@ - if (online) - stream << "" << endl; - stream << make_html_form_line("search", i18n("Package search")); - if (ext_form) -@@ -206,7 +206,7 @@ - stream << make_html_form_line("fsearch", i18n("File search")); - stream << make_html_form_line("show", i18n("Package info")); - } -- stream << html_form_end.arg( i18n("Search") ); -+ stream << html_form_end_apt.arg( i18n("Search") ); - - if (online) - { diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0-ftbfs.patch b/redhat/libraries/libtdeldap/libtdeldap-14.0.0-ftbfs.patch deleted file mode 100644 index 874d5da08..000000000 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0-ftbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-libtdeldap-14.0.0~pre91+a257ac4f/src/Makefile.am.ORI 2013-07-04 19:29:13.674536933 +0200 -+++ trinity-libtdeldap-14.0.0~pre91+a257ac4f/src/Makefile.am 2013-07-04 19:29:33.216775942 +0200 -@@ -7,7 +7,7 @@ - include_HEADERS = libtdeldap.h ldappasswddlg.h - - libtdeldap_la_SOURCES = libtdeldap.cpp ldaplogindlgbase.ui ldaplogindlg.cpp ldappasswddlg.cpp --libtdeldap_la_LIBADD = -ltdeio $(LIB_TDEUI) -lldap -+libtdeldap_la_LIBADD = -ltdeio $(LIB_TDEUI) -lldap $(LIB_QT) $(LIB_TDECORE) -ltdesu -llber - libtdeldap_la_LDFLAGS = -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined \ - $(all_libraries) - diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0-tde_includedir.patch b/redhat/libraries/python-trinity/python-trinity-14.0.0-tde_includedir.patch deleted file mode 100644 index 22c7387f3..000000000 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0-tde_includedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-python-trinity-14.0.0~pre168+4d311123/configure.py.ORI 2013-07-03 21:36:51.304975764 +0200 -+++ trinity-python-trinity-14.0.0~pre168+4d311123/configure.py 2013-07-03 21:37:14.099193791 +0200 -@@ -410,7 +410,7 @@ - - if not opt_kdeincdir: - incSearchPaths = [os.path.join (opt_tdebasedir, "include")] -- incSearchPaths.append (os.path.join (opt_tdebasedir, "include", "kde")) # Red Hat -+ incSearchPaths.append (os.path.join (opt_tdebasedir, "include", "tde")) # Red Hat - opt_kdeincdir = search ("tdeapplication.h", incSearchPaths) - - def check_kde_installation(): diff --git a/redhat/tdeartwork/tdeartwork-14.0.0-fix_update_screensaver_list.patch b/redhat/tdeartwork/tdeartwork-14.0.0-fix_update_screensaver_list.patch deleted file mode 100644 index f75947350..000000000 --- a/redhat/tdeartwork/tdeartwork-14.0.0-fix_update_screensaver_list.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- trinity-tdeartwork/tdescreensaver/kxsconfig/update_hacks.sh.ORI 2013-07-31 11:08:50.105439282 +0200 -+++ trinity-tdeartwork/tdescreensaver/kxsconfig/update_hacks.sh 2013-07-31 11:22:06.146113235 +0200 -@@ -1,18 +1,50 @@ - #!/bin/sh --scsvs=`cd /usr/lib/xscreensaver/ && ls -1 | grep -v config` -+ -+# Checks for Xscreensaver directory (may vary on different distributions) -+if [ -d /usr/libexec/xscreensaver ]; then -+ XSDIR=/usr/libexec/xscreensaver -+elif [ -d /usr/lib64/xscreensaver ]; then -+ XSDIR=/usr/lib64/xscreensaver -+else -+ XSDIR=/usr/lib/xscreensaver -+fi -+ -+# Gets list of screensavers. Exclude 'config'. -+scsvs="" -+pushd "${XSDIR}" >/dev/null -+for i in *; do -+ if [ "${i}" != "config" ]; then -+ scsvs="${scsvs} ${i}" -+ fi -+done -+popd >/dev/null -+ - echo $scsvs -+ -+# Removes useless .desktop files, if any -+for f in ScreenSavers/*.desktop; do -+ # Gets the command line for this screensaver -+ Exec="$(sed -n '/^Exec=kxsconfig / s/.* \(.*\)/\1/' $f)" -+ if [ ! -x "${XSDIR}/${Exec}" ]; then -+ echo "Removing ${f}" -+ rm -f "${f}" -+ fi -+done -+ -+# Creates missing screensavers .desktop files - for name in $scsvs; do -- if test -f /usr/lib/xscreensaver/$name && test -f /usr/share/xscreensaver/config/$name.xml && test ! -f ScreenSavers/$name.desktop; then -+ if test -f "${XSDIR}/$name" && test -f "/usr/share/xscreensaver/config/$name.xml" && test ! -f "ScreenSavers/$name.desktop"; then - echo "name: $name" - label=`grep ' $f -- if ldd /usr/lib/xscreensaver/$name 2>&1 | grep libGL; then -+ if ldd "${XSDIR}/$name" 2>&1 | grep libGL; then - sed -e "s,@GL1@,X-TDE-Category=OpenGL Screen Savers,; s,@GL2@,X-TDE-Type=OpenGL," $f > $f.new - else - grep -v @GL $f > $f.new - fi - mv $f.new $f - fi --done -+done -+ diff --git a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch b/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch deleted file mode 100644 index d066256cd..000000000 --- a/redhat/tdebindings/tdebindings-14.0.0-ftbfs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- trinity-tdebindings-14.0.0~pre209+0615ff79/dcopperl/Makefile.PL.in.ORI 2013-07-02 21:20:35.443484858 +0200 -+++ trinity-tdebindings-14.0.0~pre209+0615ff79/dcopperl/Makefile.PL.in 2013-07-02 21:20:46.551592113 +0200 -@@ -4,8 +4,8 @@ - # the contents of the Makefile that is written. - - print "Trying to find some configuration information...\n"; --my $tde_inc = "@tde_includes@"; --my $tde_lib = "@tde_libraries@"; -+my $tde_inc = "@kde_includes@"; -+my $tde_lib = "@kde_libraries@"; - my $qt_inc = "@qt_includes@"; - my $qt_lib = "@qt_libraries@"; - ---- trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/tde/Makefile.am.ORI 2013-07-02 21:30:55.952456509 +0200 -+++ trinity-tdebindings-14.0.0~pre209+0615ff79/smoke/tde/Makefile.am 2013-07-02 21:31:07.962573744 +0200 -@@ -9,7 +9,7 @@ - libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH) - - # the libraries to link against. --libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx -+libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx -lknewstuff -ltdemdi - - x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ - x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
\n"; - -- stream << html_form_begin; -+ stream << html_form_begin_apt; - stream << "
" + i18n("Offline search") + "