From c34f78dd37c2a2015d43de5d89748a2f8147ba1b Mon Sep 17 00:00:00 2001 From: root Date: Tue, 31 Jan 2012 23:14:57 +0000 Subject: Tue Jan 31 23:14:56 UTC 2012 --- testing/kdelibs3/PKGBUILD | 94 +++ testing/kdelibs3/acinclude.patch | 66 ++ testing/kdelibs3/kconf_updaterc | 2 + testing/kdelibs3/kde3.profile | 6 + testing/kdelibs3/kde4-compatibility.patch | 1012 +++++++++++++++++++++++ testing/kdelibs3/kdelibs3-missing-include.patch | 10 + testing/kdelibs3/kdelibs3.install | 12 + testing/kdelibs3/openssl.patch | 180 ++++ 8 files changed, 1382 insertions(+) create mode 100644 testing/kdelibs3/PKGBUILD create mode 100644 testing/kdelibs3/acinclude.patch create mode 100644 testing/kdelibs3/kconf_updaterc create mode 100755 testing/kdelibs3/kde3.profile create mode 100644 testing/kdelibs3/kde4-compatibility.patch create mode 100644 testing/kdelibs3/kdelibs3-missing-include.patch create mode 100644 testing/kdelibs3/kdelibs3.install create mode 100644 testing/kdelibs3/openssl.patch (limited to 'testing/kdelibs3') diff --git a/testing/kdelibs3/PKGBUILD b/testing/kdelibs3/PKGBUILD new file mode 100644 index 000000000..4bead528f --- /dev/null +++ b/testing/kdelibs3/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 148181 2012-01-30 18:47:46Z ibiru $ +# Maintainer: Eric Bélanger +# Contributor: Pierre Schmitz +# Contributor: Tobias Powalowski + +pkgname=kdelibs3 +pkgver=3.5.10 +pkgrel=12 +pkgdesc='KDE3 Core Libraries' +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' + 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') +makedepends=('cups' 'hspell') +optdepends=('hspell: for Hebrew spell-checking support') +options=('libtool') +install=kdelibs3.install +source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2" + 'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz' + 'acinclude.patch' + 'kde3.profile' + 'kde4-compatibility.patch' + 'kconf_updaterc' + 'openssl.patch' + 'kdelibs3-missing-include.patch') +sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' + 'c8ca21e4848a627760746d0a8a64bf4f90684c3e' + '50c9de71b102507fb78b192ecc22a5fc3e031bc3' + 'fbd6e773edf3e8bb8e1272629984025e041da2ca' + '5fbbf7a5e2032878815fa055bfb5020f478d2b25' + '35e56fe4c5f71685e64b13f448dcacc620166e06' + '50e92950498463defb9149ffcf8cbc2e8cd1063b' + 'e5f5b8c060a2db9cedb82bf18caadfa869921779') + +build() { + cd "$srcdir"/kdelibs-${pkgver} + + . /etc/profile.d/qt3.sh + . "$srcdir"/kde3.profile + + patch -p0 -i "$srcdir"/kde-3.5-1074156.patch + patch -p1 -i "$srcdir"/acinclude.patch + patch -p1 -i "$srcdir"/kde4-compatibility.patch + patch -p1 -i "${srcdir}"/openssl.patch + patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch + + sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh + make -f admin/Makefile.common cvs + + ./configure --prefix=/opt/kde \ + --with-distribution='Arch Linux' \ + --with-alsa \ + --disable-debug \ + --disable-dnssd \ + --disable-dnotify \ + --enable-inotify \ + --enable-sendfile \ + --without-lua \ + --with-hspell \ + --enable-gcc-hidden-visibility \ + --enable-final \ + --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \ + --without-arts \ + --disable-libfam + make +} + +package() { + cd "$srcdir"/kdelibs-${pkgver} + + make DESTDIR="$pkgdir" install + + # disable broken kconf_update by default + install -D -m644 "$srcdir"/kconf_updaterc \ + "$pkgdir"/opt/kde/share/config/kconf_updaterc + + # install KDE3 profile + install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh + # make KDE3 styles available to Qt3 + install -d -m755 "$pkgdir"/opt/qt/plugins + ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt + + # we don't have khelpcenter anyway + rm -rf "$pkgdir"/opt/kde/share/doc + + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf +} diff --git a/testing/kdelibs3/acinclude.patch b/testing/kdelibs3/acinclude.patch new file mode 100644 index 000000000..0610d6df5 --- /dev/null +++ b/testing/kdelibs3/acinclude.patch @@ -0,0 +1,66 @@ +2009-12-10 Stepan Kasal + +The change of implementation of AC_REQUIRE in 2.64 caused a regression +in the arts project. +This can be fixed by shuffling some macro calls. + +I suppose that most of this patch will not be needed with a future +release of Autoconf. +But the last chunk of this patch is a real bug in this source and +should go upstream. + +--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200 ++++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100 +@@ -3081,8 +3081,18 @@ + fi + ]) + ++AC_DEFUN([AC_CHECK_COMPILERS_CC], ++[ ++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS ++ CFLAGS=" $CFLAGS" ++ AC_PROG_CC ++ CXXFLAGS=" $CXXFLAGS" ++ AC_PROG_CXX ++]) ++ + AC_DEFUN([AC_CHECK_COMPILERS], + [ ++ AC_REQUIRE([AC_CHECK_COMPILERS_CC]) + AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]), + [ +@@ -3141,11 +3151,6 @@ + [kde_use_profiling="no"] + ) + +- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS +- CFLAGS=" $CFLAGS" +- +- AC_PROG_CC +- + AC_PROG_CPP + + if test "$GCC" = "yes"; then +@@ -3174,10 +3179,6 @@ + LDFLAGS="" + fi + +- CXXFLAGS=" $CXXFLAGS" +- +- AC_PROG_CXX +- + KDE_CHECK_FOR_BAD_COMPILER + + if test "$GXX" = "yes" || test "$CXX" = "KCC"; then +@@ -3503,8 +3504,8 @@ + AC_REQUIRE([AC_LIBTOOL_DLOPEN]) + AC_REQUIRE([KDE_CHECK_LIB64]) + +-AC_OBJEXT +-AC_EXEEXT ++AC_REQUIRE([AC_OBJEXT]) ++AC_REQUIRE([AC_EXEEXT]) + + AM_PROG_LIBTOOL + AC_LIBTOOL_CXX diff --git a/testing/kdelibs3/kconf_updaterc b/testing/kdelibs3/kconf_updaterc new file mode 100644 index 000000000..24c2623fb --- /dev/null +++ b/testing/kdelibs3/kconf_updaterc @@ -0,0 +1,2 @@ +updateInfoAdded=false +autoUpdateDisabled=true diff --git a/testing/kdelibs3/kde3.profile b/testing/kdelibs3/kde3.profile new file mode 100755 index 000000000..ef09631ff --- /dev/null +++ b/testing/kdelibs3/kde3.profile @@ -0,0 +1,6 @@ +export PATH=$PATH:/opt/kde/bin +if [ ! -z $XDG_DATA_DIRS ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share +else + export XDG_DATA_DIRS=/opt/kde/share +fi diff --git a/testing/kdelibs3/kde4-compatibility.patch b/testing/kdelibs3/kde4-compatibility.patch new file mode 100644 index 000000000..129c314ae --- /dev/null +++ b/testing/kdelibs3/kde4-compatibility.patch @@ -0,0 +1,1012 @@ +diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp +--- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 ++++ kdelibs-3.5.10.new/kdecore/kcrash.cpp 2009-08-06 06:18:06.000000000 +0200 +@@ -158,7 +158,7 @@ + int i = 0; + + // argument 0 has to be drkonqi +- argv[i++] = "drkonqi"; ++ argv[i++] = "/usr/lib/kde4/libexec/drkonqi"; + + #if defined Q_WS_X11 + // start up on the correct display +@@ -325,7 +325,7 @@ + _exit(253); + if(!geteuid() && setuid(getuid()) < 0) + _exit(253); +- execvp("drkonqi", const_cast< char** >( argv )); ++ execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv )); + _exit(errno); + } + else +diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am +--- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 17:06:29.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/Makefile.am 2009-08-06 06:21:37.000000000 +0200 +@@ -58,7 +58,7 @@ + servicetype_DATA = kdedmodule.desktop + servicetypedir = $(kde_servicetypesdir) + +-xdg_menu_DATA = applications.menu ++xdg_menu_DATA = kde-applications.menu + + update_DATA = kded.upd + updatedir = $(kde_datadir)/kconf_update +diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in +--- kdelibs-3.5.10/kded/Makefile.in 2008-08-20 18:05:57.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/Makefile.in 2009-08-06 06:22:19.000000000 +0200 +@@ -535,7 +535,7 @@ + + servicetype_DATA = kdedmodule.desktop + servicetypedir = $(kde_servicetypesdir) +-xdg_menu_DATA = applications.menu ++xdg_menu_DATA = kde-applications.menu + update_DATA = kded.upd + updatedir = $(kde_datadir)/kconf_update + #>- all: all-am +@@ -1173,7 +1173,7 @@ + -rm -f kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc + + #>+ 2 +-KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am ++KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am + + #>+ 2 + docs-am: +diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu +--- kdelibs-3.5.10/kded/applications.menu 2005-09-10 10:27:40.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100 +@@ -1,469 +0,0 @@ +- +- +- +- Applications +- kde-main.directory +- +- +- +- +- +- +- +- +- More +- +- +- +- Applications +- +- +- +- +- Applications +- kde-unknown.directory +- +- +- +- +- +- Core +- KDE +- +- +- X-SuSE-YaST +- +- +- +- +- Development +- kde-development.directory +- +- X-KDE-KDevelopIDE +- kde-development-kdevelop.directory +- +- +- Development +- X-KDE-KDevelopIDE +- +- +- +- +- Translation +- kde-development-translation.directory +- +- +- Development +- Translation +- +- +- +- +- Web Development +- kde-development-webdevelopment.directory +- +- +- Development +- WebDevelopment +- +- +- +- +- +- Development +- X-KDE-KDevelopIDE +- Translation +- WebDevelopment +- +- +- +- +- Science +- kde-science.directory +- +- +- +- Astronomy +- Biology +- Chemistry +- Geology +- MedicalSoftware +- Physics +- Math +- Science +- +- Education +- +- +- +- +- Edutainment +- kde-edutainment.directory +- +- Languages +- kde-edu-languages.directory +- +- +- Education +- +- Languages +- X-KDE-Edu-Language +- +- +- +- +- +- Mathematics +- kde-edu-mathematics.directory +- +- +- Education +- Math +- +- +- +- +- Miscellaneous +- kde-edu-miscellaneous.directory +- +- +- Education +- +- Languages +- X-KDE-Edu-Language +- Math +- Science +- Teaching +- X-KDE-Edu-Teaching +- +- +- +- +- +- Science +- kde-edu-science.directory +- +- +- Education +- Science +- +- +- +- +- Tools +- kde-edu-tools.directory +- +- +- Education +- +- Teaching +- X-KDE-Edu-Teaching +- +- +- +- +- +- +- Games +- kde-games.directory +- +- Arcade +- kde-games-arcade.directory +- +- +- Game +- ArcadeGame +- +- +- +- +- Board +- kde-games-board.directory +- +- +- Game +- BoardGame +- +- +- +- +- Card +- kde-games-card.directory +- +- +- Game +- CardGame +- +- +- +- +- Kidsgames +- kde-games-kids.directory +- +- +- Game +- +- X-KDE-KidsGame +- KidsGame +- +- +- +- +- +- TacticStrategy +- kde-games-strategy.directory +- +- +- Game +- StrategyGame +- +- +- +- +- +- Game +- +- ArcadeGame +- BoardGame +- CardGame +- X-KDE-KidsGame +- KidsGame +- StrategyGame +- +- +- +- +- Toys +- kde-toys.directory +- +- Amusement +- +- +- +- +- Graphics +- kde-graphics.directory +- +- +- Graphics +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- Graphics +- X-KDE-More +- +- +- +- +- +- Internet +- kde-internet.directory +- +- +- Network +- X-KDE-More +- +- +- +- Terminal +- kde-internet-terminal.directory +- +- +- More +- kde-more.directory +- +- +- Network +- X-KDE-More +- +- +- +- +- +- Multimedia +- kde-multimedia.directory +- +- +- AudioVideo +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- AudioVideo +- X-KDE-More +- +- +- +- +- +- Office +- kde-office.directory +- +- +- kde-koshell.desktop +- kde-Kontact.desktop +- +- kde-kword.desktop +- kde-kspread.desktop +- kde-kpresenter.desktop +- +- +- More +- +- +- +- Office +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- Office +- X-KDE-More +- +- +- +- +- +- Settingsmenu +- kde-settingsmenu.directory +- +- Settings +- +- +- +- System +- kde-system.directory +- +- +- System +- X-KDE-More +- +- +- +- More +- kde-more.directory +- +- +- System +- X-KDE-More +- +- +- +- +- ScreenSavers +- kde-system-screensavers.directory +- +- +- Terminal +- kde-system-terminal.directory +- +- +- +- Utilities +- kde-utilities.directory +- +- +- Utility +- Accessibility +- X-KDE-Utilities-Desktop +- X-KDE-Utilities-File +- X-KDE-Utilities-Peripherals +- X-KDE-Utilities-PIM +- X-KDE-More +- +- +- +- Accessibility +- kde-utilities-accessibility.directory +- +- +- Utility +- Accessibility +- +- +- +- +- Desktop +- kde-utilities-desktop.directory +- +- +- Utility +- X-KDE-Utilities-Desktop +- +- +- +- +- Editors +- kde-editors.directory +- +- TextEditor +- +- +- +- File +- kde-utilities-file.directory +- +- +- Utility +- X-KDE-Utilities-File +- +- +- +- +- Peripherals +- kde-utilities-peripherals.directory +- +- +- Utility +- X-KDE-Utilities-Peripherals +- +- +- +- +- PIM +- kde-utilities-pim.directory +- +- +- Utility +- X-KDE-Utilities-PIM +- +- +- +- +- XUtilities +- kde-utilities-xutils.directory +- +- +- More +- kde-more.directory +- +- +- Utility +- X-KDE-More +- +- +- +- +- +- +- KDE +- Core +- +- +- +- applications-kmenuedit.menu +- +diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp +--- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 09:52:43.000000000 +0200 ++++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp 2009-08-06 06:23:48.000000000 +0200 +@@ -379,7 +379,7 @@ + connect(g_vfolder, SIGNAL(newService(const QString &, KService **)), + this, SLOT(slotCreateEntry(const QString &, KService **))); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); + entry->setLayoutInfo(kdeMenu->layoutList); +diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu +--- kdelibs-3.5.10/kded/kde-applications.menu 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.10.new/kded/kde-applications.menu 2005-09-10 10:27:40.000000000 +0200 +@@ -0,0 +1,469 @@ ++ ++ ++ ++ Applications ++ kde-main.directory ++ ++ ++ ++ ++ ++ ++ ++ ++ More ++ ++ ++ ++ Applications ++ ++ ++ ++ ++ Applications ++ kde-unknown.directory ++ ++ ++ ++ ++ ++ Core ++ KDE ++ ++ ++ X-SuSE-YaST ++ ++ ++ ++ ++ Development ++ kde-development.directory ++ ++ X-KDE-KDevelopIDE ++ kde-development-kdevelop.directory ++ ++ ++ Development ++ X-KDE-KDevelopIDE ++ ++ ++ ++ ++ Translation ++ kde-development-translation.directory ++ ++ ++ Development ++ Translation ++ ++ ++ ++ ++ Web Development ++ kde-development-webdevelopment.directory ++ ++ ++ Development ++ WebDevelopment ++ ++ ++ ++ ++ ++ Development ++ X-KDE-KDevelopIDE ++ Translation ++ WebDevelopment ++ ++ ++ ++ ++ Science ++ kde-science.directory ++ ++ ++ ++ Astronomy ++ Biology ++ Chemistry ++ Geology ++ MedicalSoftware ++ Physics ++ Math ++ Science ++ ++ Education ++ ++ ++ ++ ++ Edutainment ++ kde-edutainment.directory ++ ++ Languages ++ kde-edu-languages.directory ++ ++ ++ Education ++ ++ Languages ++ X-KDE-Edu-Language ++ ++ ++ ++ ++ ++ Mathematics ++ kde-edu-mathematics.directory ++ ++ ++ Education ++ Math ++ ++ ++ ++ ++ Miscellaneous ++ kde-edu-miscellaneous.directory ++ ++ ++ Education ++ ++ Languages ++ X-KDE-Edu-Language ++ Math ++ Science ++ Teaching ++ X-KDE-Edu-Teaching ++ ++ ++ ++ ++ ++ Science ++ kde-edu-science.directory ++ ++ ++ Education ++ Science ++ ++ ++ ++ ++ Tools ++ kde-edu-tools.directory ++ ++ ++ Education ++ ++ Teaching ++ X-KDE-Edu-Teaching ++ ++ ++ ++ ++ ++ ++ Games ++ kde-games.directory ++ ++ Arcade ++ kde-games-arcade.directory ++ ++ ++ Game ++ ArcadeGame ++ ++ ++ ++ ++ Board ++ kde-games-board.directory ++ ++ ++ Game ++ BoardGame ++ ++ ++ ++ ++ Card ++ kde-games-card.directory ++ ++ ++ Game ++ CardGame ++ ++ ++ ++ ++ Kidsgames ++ kde-games-kids.directory ++ ++ ++ Game ++ ++ X-KDE-KidsGame ++ KidsGame ++ ++ ++ ++ ++ ++ TacticStrategy ++ kde-games-strategy.directory ++ ++ ++ Game ++ StrategyGame ++ ++ ++ ++ ++ ++ Game ++ ++ ArcadeGame ++ BoardGame ++ CardGame ++ X-KDE-KidsGame ++ KidsGame ++ StrategyGame ++ ++ ++ ++ ++ Toys ++ kde-toys.directory ++ ++ Amusement ++ ++ ++ ++ ++ Graphics ++ kde-graphics.directory ++ ++ ++ Graphics ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Graphics ++ X-KDE-More ++ ++ ++ ++ ++ ++ Internet ++ kde-internet.directory ++ ++ ++ Network ++ X-KDE-More ++ ++ ++ ++ Terminal ++ kde-internet-terminal.directory ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Network ++ X-KDE-More ++ ++ ++ ++ ++ ++ Multimedia ++ kde-multimedia.directory ++ ++ ++ AudioVideo ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ AudioVideo ++ X-KDE-More ++ ++ ++ ++ ++ ++ Office ++ kde-office.directory ++ ++ ++ kde-koshell.desktop ++ kde-Kontact.desktop ++ ++ kde-kword.desktop ++ kde-kspread.desktop ++ kde-kpresenter.desktop ++ ++ ++ More ++ ++ ++ ++ Office ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Office ++ X-KDE-More ++ ++ ++ ++ ++ ++ Settingsmenu ++ kde-settingsmenu.directory ++ ++ Settings ++ ++ ++ ++ System ++ kde-system.directory ++ ++ ++ System ++ X-KDE-More ++ ++ ++ ++ More ++ kde-more.directory ++ ++ ++ System ++ X-KDE-More ++ ++ ++ ++ ++ ScreenSavers ++ kde-system-screensavers.directory ++ ++ ++ Terminal ++ kde-system-terminal.directory ++ ++ ++ ++ Utilities ++ kde-utilities.directory ++ ++ ++ Utility ++ Accessibility ++ X-KDE-Utilities-Desktop ++ X-KDE-Utilities-File ++ X-KDE-Utilities-Peripherals ++ X-KDE-Utilities-PIM ++ X-KDE-More ++ ++ ++ ++ Accessibility ++ kde-utilities-accessibility.directory ++ ++ ++ Utility ++ Accessibility ++ ++ ++ ++ ++ Desktop ++ kde-utilities-desktop.directory ++ ++ ++ Utility ++ X-KDE-Utilities-Desktop ++ ++ ++ ++ ++ Editors ++ kde-editors.directory ++ ++ TextEditor ++ ++ ++ ++ File ++ kde-utilities-file.directory ++ ++ ++ Utility ++ X-KDE-Utilities-File ++ ++ ++ ++ ++ Peripherals ++ kde-utilities-peripherals.directory ++ ++ ++ Utility ++ X-KDE-Utilities-Peripherals ++ ++ ++ ++ ++ PIM ++ kde-utilities-pim.directory ++ ++ ++ Utility ++ X-KDE-Utilities-PIM ++ ++ ++ ++ ++ XUtilities ++ kde-utilities-xutils.directory ++ ++ ++ More ++ kde-more.directory ++ ++ ++ Utility ++ X-KDE-More ++ ++ ++ ++ ++ ++ ++ KDE ++ Core ++ ++ ++ ++ applications-kmenuedit.menu ++ diff --git a/testing/kdelibs3/kdelibs3-missing-include.patch b/testing/kdelibs3/kdelibs3-missing-include.patch new file mode 100644 index 000000000..5b84ef746 --- /dev/null +++ b/testing/kdelibs3/kdelibs3-missing-include.patch @@ -0,0 +1,10 @@ +--- kdeprint/cups/cupsdconf2/cups-util.c.old 2012-01-19 01:30:26.000000000 -0500 ++++ kdeprint/cups/cupsdconf2/cups-util.c 2012-01-19 01:31:33.000000000 -0500 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/testing/kdelibs3/kdelibs3.install b/testing/kdelibs3/kdelibs3.install new file mode 100644 index 000000000..7291ac0a2 --- /dev/null +++ b/testing/kdelibs3/kdelibs3.install @@ -0,0 +1,12 @@ +post_install() { + post_remove +} + +post_upgrade() { + post_remove +} + +post_remove() { + # this can be removed in future versions + sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf +} diff --git a/testing/kdelibs3/openssl.patch b/testing/kdelibs3/openssl.patch new file mode 100644 index 000000000..a948b884a --- /dev/null +++ b/testing/kdelibs3/openssl.patch @@ -0,0 +1,180 @@ +diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc +--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200 ++++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200 +@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons + static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, + const EVP_CIPHER *,unsigned char *,int , + pem_password_cb *, void *) = 0L; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; ++static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; ++#else + static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; + static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; + static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; ++#endif + static int (*K_X509_print_fp) (FILE *, X509*) = 0L; + static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; + static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; +@@ -430,9 +435,14 @@ KConfig *cfg; + K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); + K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); + K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); ++ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); ++#else + K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); + K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); + K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); ++#endif + K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); + K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); + K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); +@@ -594,7 +604,7 @@ KConfig *cfg; + K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); + K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); + K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); +- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); ++ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); + #endif + + +@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI + else return -1; + } + +- ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { ++ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) ++ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); ++ else return -1; ++} ++#else + ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { + if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); + else return 0L; +@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out + return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); + else return -1; + } +- ++#endif + + int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { + if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); +diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h +--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200 ++++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200 +@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate; + #include + #include + #undef crypt ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define STACK _STACK ++#endif + #endif + + #include +@@ -446,12 +449,12 @@ public: + */ + int PEM_write_bio_X509(BIO *bp, X509 *x); + +- ++#if OPENSSL_VERSION_NUMBER < 0x10000000L + /* + * X509_asn1_meth - used for netscape output + */ + ASN1_METHOD *X509_asn1_meth(); +- ++#endif + + /* + * ASN1_i2d_fp - used for netscape output +@@ -531,6 +534,9 @@ public: + */ + void sk_free(STACK *s); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ void sk_free(void *s) { return sk_free(reinterpret_cast(s)); } ++#endif + + /* + * Number of elements in the stack +@@ -543,6 +549,9 @@ public: + */ + char *sk_value(STACK *s, int n); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast(s), n); } ++#endif + + /* + * Create a new stack +@@ -555,6 +564,9 @@ public: + */ + int sk_push(STACK *s, char *d); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast(s), reinterpret_cast(d)); } ++#endif + + /* + * Duplicate the stack +diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc +--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200 ++++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200 +@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate + + + STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList &certs) { +- STACK_OF(X509) *x509 = sk_new(NULL); ++ STACK_OF(X509) *x509 = reinterpret_cast(sk_new(NULL)); + KSSLCertificate *cert = certs.first(); + while(cert) { + sk_X509_push(x509, cert->getCert()); +diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc +--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100 ++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200 +@@ -1003,17 +1003,31 @@ return qba; + QByteArray KSSLCertificate::toNetscape() { + QByteArray qba; + #ifdef KSSL_HAVE_SSL +-ASN1_HEADER ah; +-ASN1_OCTET_STRING os; +-KTempFile ktf; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ NETSCAPE_X509 nx; ++ ASN1_OCTET_STRING hdr; ++#else ++ ASN1_HEADER ah; ++ ASN1_OCTET_STRING os; ++#endif ++ KTempFile ktf; + +- os.data = (unsigned char *)NETSCAPE_CERT_HDR; +- os.length = strlen(NETSCAPE_CERT_HDR); +- ah.header = &os; +- ah.data = (char *)getCert(); +- ah.meth = d->kossl->X509_asn1_meth(); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; ++ hdr.length = strlen(NETSCAPE_CERT_HDR); ++ nx.header = &hdr; ++ nx.cert = getCert(); ++ ++ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); ++#else ++ os.data = (unsigned char *)NETSCAPE_CERT_HDR; ++ os.length = strlen(NETSCAPE_CERT_HDR); ++ ah.header = &os; ++ ah.data = (char *)getCert(); ++ ah.meth = d->kossl->X509_asn1_meth(); + +- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); ++ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); ++#endif + + ktf.close(); + -- cgit v1.2.3-54-g00ecf