diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-04-27 22:26:40 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-04-27 22:26:40 +0000 |
commit | 8784d3134c1d4b4c02d705259ae2ebd768c778fd (patch) | |
tree | 2d5e15ad1adac97b4a07a58b1618dda602cea3a0 /extra | |
parent | 18d6577d511b9a1ac36eaae50060133a401e42a3 (diff) |
Wed Apr 27 22:26:47 UTC 2011
Diffstat (limited to 'extra')
-rw-r--r-- | extra/avogadro/fix-pycapsule.patch | 23 | ||||
-rw-r--r-- | extra/avogadro/sip-4.11.patch | 34 | ||||
-rw-r--r-- | extra/faad2/ChangeLog | 26 | ||||
-rw-r--r-- | extra/kdepim/asynchronous-start.patch | 87 | ||||
-rw-r--r-- | extra/latex2html/PKGBUILD | 45 | ||||
-rw-r--r-- | extra/latex2html/latex2html.install | 15 | ||||
-rw-r--r-- | extra/nitrogen/ChangeLog | 9 | ||||
-rw-r--r-- | extra/slang/slang-2.2.3-faster-baud-rates.patch | 62 | ||||
-rw-r--r-- | extra/wxpython/editra-aui.diff | 11 |
9 files changed, 0 insertions, 312 deletions
diff --git a/extra/avogadro/fix-pycapsule.patch b/extra/avogadro/fix-pycapsule.patch deleted file mode 100644 index de4e2ca75..000000000 --- a/extra/avogadro/fix-pycapsule.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- avogadro-1.0.1/libavogadro/src/python/sip.cpp 2010-05-02 17:31:22.000000000 +0100 -+++ avogadro-1.0.1-pycapsule/libavogadro/src/python/sip.cpp 2010-11-23 19:00:09.000000000 +0000 -@@ -62,12 +62,20 @@ bool init_sip_api() - return false; - } - -+#ifdef SIP_USE_PYCAPSULE -+ if (!PyCapsule_IsValid(sip_capi_obj.ptr(), "sip._C_API")) { -+#else - if (!PyCObject_Check(sip_capi_obj.ptr())) { -+#endif - std::cout << "The _C_API object in the sip python module is invalid." << std::endl; - return false; - } - -+#ifdef SIP_USE_PYCAPSULE -+ sip_API = reinterpret_cast<const sipAPIDef*>(PyCapsule_GetPointer(sip_capi_obj.ptr(), "sip._C_API")); -+#else - sip_API = reinterpret_cast<const sipAPIDef*>(PyCObject_AsVoidPtr(sip_capi_obj.ptr())); -+#endif - - return true; - } diff --git a/extra/avogadro/sip-4.11.patch b/extra/avogadro/sip-4.11.patch deleted file mode 100644 index 0cd1e5b94..000000000 --- a/extra/avogadro/sip-4.11.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake ---- avogadro-1.0.1/cmake/modules/PythonDeps.cmake 2010-05-02 18:31:22.000000000 +0200 -+++ avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake 2010-09-14 19:11:50.000000000 +0200 -@@ -59,10 +59,13 @@ - if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h) - message(STATUS "Found sip.h header...") - execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION) -- if (${SIP_VERSION} VERSION_GREATER "4.8") -+ if (NOT ${SIP_VERSION} VERSION_LESS "4.11") -+ message(STATUS "using sip version 4.11 or above...") -+ add_definitions( -DSIP_4_11 -DSIP_4_8 ) -+ elseif (NOT ${SIP_VERSION} VERSION_LESS "4.8") - message(STATUS "using sip version 4.8 or above...") - add_definitions( -DSIP_4_8 ) -- endif (${SIP_VERSION} VERSION_GREATER "4.8") -+ endif (NOT ${SIP_VERSION} VERSION_LESS "4.11") - else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h) - message(STATUS "sip.h header NOT found - Python support disabled") - # message(STATUS "debian/ubuntu: install the python-sip4-dev package.") -diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp ---- avogadro-1.0.1/libavogadro/src/python/sip.cpp 2010-05-02 18:31:22.000000000 +0200 -+++ avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp 2010-09-14 19:13:31.000000000 +0200 -@@ -204,7 +204,11 @@ - sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr); - #endif - // return the C++ pointer -+#ifdef SIP_4_11 -+ return sip_API->api_get_address(wrapper); -+#else - return wrapper->u.cppPtr; -+#endif - } - - QClass_converters() diff --git a/extra/faad2/ChangeLog b/extra/faad2/ChangeLog deleted file mode 100644 index ed5548b7d..000000000 --- a/extra/faad2/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -2009-02-16 Eric Belanger <eric@archlinux.org> - - * faad2 2.7-1 - * Upstream update - * Updated LICENSE file - * Compiled with -fPIC option - -2009-01-05 Eric Belanger <eric@archlinux.org> - - * faad2 2.6.1-2 - * Applied security patch - -2008-07-19 Eric Belanger <eric@archlinux.org> - - * faad2 2.6.1-1 - * Upstream update - * Patched to fix libtool build problem : - faad2-2.6.1-libtool22.patch - * Patched to make faad2 exit if output pipe breaks : - faad2-2.6.1-broken-pipe.patch - * Patched to fix include file implicit declaration : - faad2-2.6.1-implicitdeclar.patch - * Patched to bump soname (symbols have been changed) : - faad2-2.6.1-abi_has_changed.patch - * Updated license - * Added ChangeLog diff --git a/extra/kdepim/asynchronous-start.patch b/extra/kdepim/asynchronous-start.patch deleted file mode 100644 index bc014116c..000000000 --- a/extra/kdepim/asynchronous-start.patch +++ /dev/null @@ -1,87 +0,0 @@ -commit cfa404b7188e4c26bddbc9579728f6d25f8cd214 -Author: Stephen Kelly <steveire@gmail.com> -Date: Tue Apr 5 11:09:43 2011 +0200 - - Start kdepim 4.4 asynchronously if built against 4.6. - - The synchronous mechanism doesn't have enough time to start - before it reports failure. - -diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp -index 4c8ca42..200f8ec 100644 ---- a/kaddressbook/main.cpp -+++ b/kaddressbook/main.cpp -@@ -49,11 +49,13 @@ int main( int argc, char **argv ) - MainWindow *window = new MainWindow; - window->show(); - -+#if !KDE_IS_VERSION(4,6,0) - if ( !Akonadi::Control::start( window ) ) { - //TODO: add message box after string freeze - kWarning() << "Unable to start Akonadi server, exit application"; - return 1; - } -+#endif - - return app.exec(); - } -diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp -index a31973a..10b14e4 100644 ---- a/kmail/kmmainwidget.cpp -+++ b/kmail/kmmainwidget.cpp -@@ -165,6 +165,9 @@ using KMail::TemplateParser; - - #include <errno.h> // ugh - -+#include <akonadi/control.h> -+#include <akonadi/servermanager.h> -+ - #include "kmmainwidget.moc" - - K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList ) -@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient, - mVacationIndicatorActive( false ), - mGoToFirstUnreadMessageInSelectedFolder( false ) - { -+#if KDE_IS_VERSION(4,6,0) -+ Akonadi::Control::widgetNeedsAkonadi(this); -+ Akonadi::ServerManager::start(); -+#endif - // must be the first line of the constructor: - mStartupDone = false; - mWasEverShown = false; -diff --git a/kmail/main.cpp b/kmail/main.cpp -index f39ca5f..c2dd1c3 100644 ---- a/kmail/main.cpp -+++ b/kmail/main.cpp -@@ -145,12 +145,14 @@ int main(int argc, char *argv[]) - app.setEventLoopReached(); - app.delayedInstanceCreation(); - -+#if !KDE_IS_VERSION(4,6,0) - // Start Akonadi - if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) { - //TODO: add message box after string freeze - kWarning() << "Unable to start Akonadi server, exit application"; - return 1; - } -+#endif - - // Go! - int ret = qApp->exec(); -diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp -index 356aa57..cb4a235 100644 ---- a/kontact/src/main.cpp -+++ b/kontact/src/main.cpp -@@ -199,9 +199,11 @@ int main( int argc, char **argv ) - - KontactApp app; - -+#if !KDE_IS_VERSION(4,6,0) - // KDE 4.4: do akonadi startup before creating any window, since creating - // the window loads kmail. In 4.5 we'll do this startup async instead. - Akonadi::Control::start( 0 ); -+#endif - - // Qt doesn't treat the system tray as a window, and therefore Qt would quit - // the event loop when an error message is clicked away while Kontact is in the diff --git a/extra/latex2html/PKGBUILD b/extra/latex2html/PKGBUILD deleted file mode 100644 index 74ab7b66e..000000000 --- a/extra/latex2html/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 20302 2008-12-02 10:44:29Z ronald $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> -# Contributor: Jason Chu <jason.archlinux.org> - -pkgname=latex2html -pkgver=2008 -pkgrel=1 -pkgdesc="latex2html is a convertor written in Perl that converts LaTeX documents to HTML." -arch=('i686' 'x86_64') -url="http://saftsack.fs.uni-bayreuth.de/~latex2ht/" -depends=('perl' 'ghostscript' 'texlive-core' 'libpng' 'giflib' 'netpbm') -install=$pkgname.install -license=('GPL2') -source=(http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/$pkgname-$pkgver.tar.gz) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=$startdir/pkg/usr \ - --shlibdir=$startdir/pkg/usr/lib/$pkgname \ - --with-texpath=$startdir/pkg/usr/share/texmf/tex/latex/html \ - --enable-wrapper \ - --enable-gif \ - --enable-png || return 1 - - make || return 1 - make install || return 1 - - find $startdir/pkg/usr -type f -print | while read filename; do - if [ ! -z '`grep "$startdir" "$filename"`' ]; then - mv $filename $filename.mkpkg - sed -e "s#$pkgdir##g" -e "s#$srcdir##g" < $filename.mkpkg > $filename - rm $filename.mkpkg - fi - done - - # move files to FHS location - mv $startdir/pkg/usr/cfgcache.pm $startdir/pkg/usr/l2hconf.pm $startdir/pkg/usr/lib/$pkgname/ - - # set correct permission on executables - chmod 755 $pkgdir/usr/bin/pstoimg \ - $pkgdir/usr/bin/$pkgname \ - $pkgdir/usr/bin/texexpand - -} diff --git a/extra/latex2html/latex2html.install b/extra/latex2html/latex2html.install deleted file mode 100644 index afbeeb50c..000000000 --- a/extra/latex2html/latex2html.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - echo ">>> texlive: updating the filename database..." - texconfig-sys rehash -} - -post_upgrade() { - echo ">>> texlive: updating the filename database..." - texconfig-sys rehash -} - -post_remove() { - echo ">>> texlive: updating the filename database..." - texconfig-sys rehash -} - diff --git a/extra/nitrogen/ChangeLog b/extra/nitrogen/ChangeLog deleted file mode 100644 index c37e10baf..000000000 --- a/extra/nitrogen/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2008-08-04 Alexander Fehr <pizzapunk gmail com> - - * nitrogen-1.4-1: - New upstream release. - New maintainer. - Changed url. - Added dependency on hicolor-icon-theme. - Added install file (gtk-update-icon-cache). - Added ChangeLog. diff --git a/extra/slang/slang-2.2.3-faster-baud-rates.patch b/extra/slang/slang-2.2.3-faster-baud-rates.patch deleted file mode 100644 index b37b253f4..000000000 --- a/extra/slang/slang-2.2.3-faster-baud-rates.patch +++ /dev/null @@ -1,62 +0,0 @@ -The baud rate constant list used for setting the SLang_TT_Baud_Rate -variable contains baud rates only up to 230400; any faster baud rate is -not properly detected, and SLang_TT_Baud_Rate is left as 0. This caused -problems at least with the Midnight Commander: - - https://www.midnight-commander.org/ticket/2452 - -(recent versions of rxvt-unicode set speed 4000000 for the pty (and -there is no configurable option for this), and mc then considers such -terminal as "slow" due to SLang_TT_Baud_Rate == 0 and turns off some -useful UI options). - -This patch adds missing values to the Baud_Rates array in src/slutty.c, -which fixes the baud rate detection problem. It also brings this array -in sync with Baudrate_Map in modules/termios-module.c, where those -higher baud rates were already present for some time. - - ---- slang-2.2.3/src/slutty.c.alt-baud-rates 2010-12-15 13:56:48.000000000 +0300 -+++ slang-2.2.3/src/slutty.c 2011-01-09 22:34:59.911000008 +0300 -@@ -170,6 +170,42 @@ static Baud_Rate_Type Baud_Rates [] = - #ifdef B230400 - {B230400, 230400}, - #endif -+#ifdef B460800 -+ {B460800, 460800}, -+#endif -+#ifdef B500000 -+ {B500000, 500000}, -+#endif -+#ifdef B576000 -+ {B576000, 576000}, -+#endif -+#ifdef B921600 -+ {B921600, 921600}, -+#endif -+#ifdef B1000000 -+ {B1000000, 1000000}, -+#endif -+#ifdef B1152000 -+ {B1152000, 1152000}, -+#endif -+#ifdef B1500000 -+ {B1500000, 1500000}, -+#endif -+#ifdef B2000000 -+ {B2000000, 2000000}, -+#endif -+#ifdef B2500000 -+ {B2500000, 2500000}, -+#endif -+#ifdef B3000000 -+ {B3000000, 3000000}, -+#endif -+#ifdef B3500000 -+ {B3500000, 3500000}, -+#endif -+#ifdef B4000000 -+ {B4000000, 4000000}, -+#endif - {0, 0} - }; diff --git a/extra/wxpython/editra-aui.diff b/extra/wxpython/editra-aui.diff deleted file mode 100644 index afdcf9f8f..000000000 --- a/extra/wxpython/editra-aui.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur wxPython-src-2.8.11.0-orig/wxPython/setup.py wxPython-src-2.8.11.0/wxPython/setup.py ---- wxPython-src-2.8.11.0-orig/wxPython/setup.py 2010-06-04 04:15:47.000000000 -0400 -+++ wxPython-src-2.8.11.0/wxPython/setup.py 2010-06-04 04:18:36.000000000 -0400 -@@ -893,6 +893,7 @@ - 'wx.tools.Editra.src.eclib', - 'wx.tools.Editra.src.ebmlib', - 'wx.tools.Editra.src.extern', -+ 'wx.tools.Editra.src.extern.aui', - 'wx.tools.Editra.src.syntax', - ] - |