From 5894dd675f4bd3ba296d262fae99b3b87a0f87fd Mon Sep 17 00:00:00 2001 From: root Date: Thu, 24 Nov 2011 23:14:53 +0000 Subject: Thu Nov 24 23:14:53 UTC 2011 --- community/gecko-mediaplayer/PKGBUILD | 14 ++- community/gecko-mediaplayer/firefox-8.patch | 48 ++++++++++ community/gri/PKGBUILD | 9 +- community/gri/gri.install | 2 +- community/gsmartcontrol/PKGBUILD | 6 +- community/libmatio/PKGBUILD | 4 +- community/libnids/PKGBUILD | 10 +- community/multiget/PKGBUILD | 9 +- community/multipath-tools/PKGBUILD | 19 ++-- community/multipath-tools/fix-build.patch | 140 ++++++++++++++++++++++++++++ community/pion-net/PKGBUILD | 12 +-- community/qdevelop/qt47.patch | 24 +++++ community/sword/PKGBUILD | 12 ++- community/torcs/PKGBUILD | 13 +-- 14 files changed, 272 insertions(+), 50 deletions(-) create mode 100644 community/gecko-mediaplayer/firefox-8.patch create mode 100644 community/multipath-tools/fix-build.patch create mode 100644 community/qdevelop/qt47.patch (limited to 'community') diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 03eda7afa..e4c890fa3 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51299 2011-07-06 15:48:09Z lfleischer $ +# $Id: PKGBUILD 59322 2011-11-23 15:17:06Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Allan McRae # Contributor: fancris3 @@ -6,7 +6,7 @@ pkgname=gecko-mediaplayer pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64') url='http://code.google.com/p/gecko-mediaplayer/' @@ -14,13 +14,17 @@ license=('GPL') depends=("gnome-mplayer>=${pkgver}" 'dbus-glib') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') -source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('7bb7665f8a1e6832907d052863e8f7aa') +source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" + 'firefox-8.patch') +md5sums=('7bb7665f8a1e6832907d052863e8f7aa' + 'e58a8fc33c1cf7a2453e1f6612acf028') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --without-gconf + patch -p1 -i ../firefox-8.patch + + ./configure --prefix=/usr --sysconfdir=/etc --without-gconf --enable-new-libxul make } diff --git a/community/gecko-mediaplayer/firefox-8.patch b/community/gecko-mediaplayer/firefox-8.patch new file mode 100644 index 000000000..d4db7afd3 --- /dev/null +++ b/community/gecko-mediaplayer/firefox-8.patch @@ -0,0 +1,48 @@ +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/np_entry.cpp gecko-mediaplayer-1.0.5b1-new/src/np_entry.cpp +--- gecko-mediaplayer-1.0.5b1-old/src/np_entry.cpp 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/np_entry.cpp 2011-11-22 15:57:46.751354874 +0200 +@@ -80,9 +80,9 @@ + + #endif /* XP_WIN */ + +-char *NPP_GetMIMEDescription(); ++const char *NPP_GetMIMEDescription(); + +-char *NP_GetMIMEDescription() ++const char *NP_GetMIMEDescription() + { + return NPP_GetMIMEDescription(); + } +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/npp_gate.cpp gecko-mediaplayer-1.0.5b1-new/src/npp_gate.cpp +--- gecko-mediaplayer-1.0.5b1-old/src/npp_gate.cpp 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/npp_gate.cpp 2011-11-22 15:58:02.473353591 +0200 +@@ -44,7 +44,7 @@ + #include "plugin_types.h" + #include "plugin_setup.h" + +-char *NPP_GetMIMEDescription(void) ++const char *NPP_GetMIMEDescription(void) + { + return GetMIMEDescription(); + } +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/npupp.h gecko-mediaplayer-1.0.5b1-new/src/npupp.h +--- gecko-mediaplayer-1.0.5b1-old/src/npupp.h 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/npupp.h 2011-11-22 15:56:32.262360950 +0200 +@@ -684,7 +684,7 @@ + + NPError OSCALL NP_Shutdown(); + +- char *NP_GetMIMEDescription(); ++ const char *NP_GetMIMEDescription(); + + #ifdef __cplusplus + } +@@ -700,7 +700,7 @@ + + /* plugin meta member functions */ + +- NP_EXPORT(char *) NP_GetMIMEDescription(void); ++ NP_EXPORT(const char *) NP_GetMIMEDescription(void); + NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs *, NPPluginFuncs *); + NP_EXPORT(NPError) NP_Shutdown(void); + NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue); diff --git a/community/gri/PKGBUILD b/community/gri/PKGBUILD index 19ba1e79a..bfbbb3451 100644 --- a/community/gri/PKGBUILD +++ b/community/gri/PKGBUILD @@ -1,16 +1,18 @@ +# $Id: PKGBUILD 59365 2011-11-23 20:42:48Z andrea $ +# Maintainer: # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: big_gie nbigaouette . at . gmail.com -# Maintainer: Stefan Husmann +# Contributor: Stefan Husmann pkgname=gri pkgver=2.12.23 pkgrel=1 -pkgdesc="A script-based language for scientific graphics programming." +pkgdesc="A script-based language for scientific graphics programming" arch=('i686' 'x86_64') license=('GPL') url="http://gri.sourceforge.net/" depends=('perl') -makedepends=('ghostscript' 'gzip' 'imagemagick') +makedepends=('ghostscript' 'gzip' 'imagemagick' 'texlive-bin') source=(http://downloads.sourceforge.net/gri/$pkgname-$pkgver.tar.gz) install=gri.install md5sums=('eabd37f80ac51f7aef83a89234fb6522') @@ -20,6 +22,7 @@ build() { ./configure --prefix=/usr make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/community/gri/gri.install b/community/gri/gri.install index 9252cc494..578968e39 100644 --- a/community/gri/gri.install +++ b/community/gri/gri.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gri.info.gz) post_install() { diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index b1a9ce27f..2a4035393 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -2,12 +2,14 @@ pkgname=gsmartcontrol pkgver=0.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" license=('GPL3') -depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2') +depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage') +optdepends=('gnomesu: for gsmartcontrol-root' + 'gksu: for gsmartcontrol-root') install=${pkgname}.install source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2) md5sums=('d2ac685e2e73b05f7ba74c93623af739') diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD index 61263e4d3..35563bd11 100644 --- a/community/libmatio/PKGBUILD +++ b/community/libmatio/PKGBUILD @@ -1,6 +1,7 @@ -# $Id: PKGBUILD 19607 2010-06-26 05:40:09Z shusmann $ +# $Id: PKGBUILD 59370 2011-11-23 21:07:37Z andrea $ # Maintainer: Stefan Husmann # Contributor: William Rea + pkgname=libmatio pkgver=1.3.3 pkgrel=2 @@ -9,6 +10,7 @@ arch=('i686' 'x86_64') license=('LGPL') url="http://sourceforge.net/projects/matio" depends=('gcc-libs') +makedepends=('gcc-fortran') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/matio/matio-$pkgver.tar.gz) md5sums=('5c12a98f391de000e88b5a1b20d74abf') diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD index 9c3991524..903663aa7 100644 --- a/community/libnids/PKGBUILD +++ b/community/libnids/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80211 2010-05-13 16:40:37Z andrea $ +# $Id: PKGBUILD 59373 2011-11-23 21:13:03Z andrea $ # Maintainer: # Contributor: Essien Ita Essien # Contributor: damir @@ -17,12 +17,12 @@ md5sums=('72d37c79c85615ffe158aa524d649610') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --man=/usr/share/man || return 1 - make static shared || return 1 + ./configure --prefix=/usr --man=/usr/share/man --enable-shared + make } package() { cd $srcdir/$pkgname-$pkgver - make install_prefix=$pkgdir install _installshared || return 1 - ln -s libnids.so.1.24 $pkgdir/usr/lib/libnids.so.1 || return 1 + make install_prefix=$pkgdir install + ln -s libnids.so.1.24 $pkgdir/usr/lib/libnids.so.1 } diff --git a/community/multiget/PKGBUILD b/community/multiget/PKGBUILD index 2d906b7ad..d2d16bb51 100644 --- a/community/multiget/PKGBUILD +++ b/community/multiget/PKGBUILD @@ -1,5 +1,7 @@ +# $Id: PKGBUILD 59362 2011-11-23 20:36:41Z andrea $ +# Maintainer: +# Contributor: Stefan Husmann # Contributor: Allan McRae -# Maintainer: Stefan Husmann pkgname=multiget pkgver=3 @@ -7,11 +9,9 @@ pkgrel=1 pkgdesc="Easy to use GUI file downloader - svn version" url="http://multiget.sourceforge.net" license=('GPL') -depends=('wxgtk') +depends=('wxgtk' 'libglade') makedepends=('intltool' 'svn') arch=('i686' 'x86_64') -source=() -md5sums=() _svntrunk=https://multiget.svn.sourceforge.net/svnroot/multiget _svnmod=multiget @@ -30,6 +30,7 @@ cd "$srcdir" ./autogen.sh --prefix=/usr --docdir=/usr/share/doc/${_svnmod} make } + package() { cd ${srcdir}/$_svnmod-build make DESTDIR=${pkgdir} install diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index 1fd153d38..ca99de9c5 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,6 +1,9 @@ -# Maintainer: Thomas S Hatch +# $Id: PKGBUILD 59357 2011-11-23 20:31:03Z andrea $ +# Maintainer: +# Contributor: Thomas S Hatch # Contributor: Michael P # Contributor: Matt Heagney + pkgname=multipath-tools pkgver=0.4.9 pkgrel=4 @@ -9,27 +12,26 @@ arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" license=('GPL') depends=('libaio' 'device-mapper') -makedepends=() -provides=() -conflicts=() -replaces=() backup=('etc/multipath.conf' 'etc/multipath.conf.annotated' 'etc/rc.d/multipathd' ) install=multipath-tools.install source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" "multipath.conf" "multipath.conf.annotated" - "multipathd.rc") -noextract=() + "multipathd.rc" + 'fix-build.patch') md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' 'd0fb11398cc628c7997111efdc5d52e5' '5a93f993ec05fc99094d5139aabd3925' - '1c2dcf43a6b5ae84ec1fae0fee071336') + '1c2dcf43a6b5ae84ec1fae0fee071336' + '2576fc535d7fa767837b1c7827013e52') build() { #Needs to be fixed upstream. Refer to # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 cd "$srcdir" + patch -p1 -i "${srcdir}"/fix-build.patch + env LDFLAGS=${LDFLAGS//-Wl,--as-needed}\ make } @@ -43,4 +45,3 @@ package() { install -D -m 644 $srcdir/multipath.conf.annotated $pkgdir/etc/multipath.conf.annotated install -D -m 755 $srcdir/multipathd.rc $pkgdir/etc/rc.d/multipathd } - diff --git a/community/multipath-tools/fix-build.patch b/community/multipath-tools/fix-build.patch new file mode 100644 index 000000000..c6196f73b --- /dev/null +++ b/community/multipath-tools/fix-build.patch @@ -0,0 +1,140 @@ +--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 +@@ -6,7 +6,7 @@ + + CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-LDFLAGS = -ldevmapper ++LIBS = -ldevmapper + OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ + gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o + EXEC = kpartx +@@ -14,8 +14,7 @@ + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: $(EXEC) $(EXEC).8 + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) +@@ -23,13 +22,14 @@ + $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 +@@ -32,11 +32,10 @@ + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + +-GZIP = /bin/gzip -9 -c + INSTALL_PROGRAM = install + +-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes ++CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + + %.o: %.c +--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 +@@ -7,32 +7,30 @@ + OBJS = main.o + + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath + + EXEC = multipath + + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz +- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) + + uninstall: +- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules +- rm $(DESTDIR)$(bindir)/$(EXEC) +- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz +- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ rm -f $(DESTDIR)$(bindir)/$(EXEC) ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 +@@ -6,8 +6,8 @@ + # basic flags setting + # + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ +- -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ ++ -L$(multipathdir) -lmultipath + + # + # debuging stuff +@@ -28,21 +28,20 @@ + all : $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(rcdir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) + diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD index b359ca4f0..22669236d 100644 --- a/community/pion-net/PKGBUILD +++ b/community/pion-net/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58325 2011-11-11 13:52:07Z stativ $ +# $Id: PKGBUILD 59342 2011-11-23 19:04:28Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: David Watzke pkgname=pion-net -pkgver=4.0.5 -pkgrel=3 +pkgver=4.0.7 +pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') @@ -12,14 +12,14 @@ license=('custom:Boost') depends=('boost-libs' 'openssl' 'log4cpp') makedepends=('boost') source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" - "$pkgname-$pkgver-build.patch") -md5sums=('1030fcce124621de705bdab40a1d977c' + "$pkgname-4.0.5-build.patch") +md5sums=('761c8af8dc54102b637f8d91d162f987' 'd75ea2af90163a81d2bc71fda00f0c00') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver-build.patch" + patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch" # override configure bug (forces debug even when nobody asked for it) sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure diff --git a/community/qdevelop/qt47.patch b/community/qdevelop/qt47.patch new file mode 100644 index 000000000..a1607779b --- /dev/null +++ b/community/qdevelop/qt47.patch @@ -0,0 +1,24 @@ +Description: Fix FTBFS with Qt 4.7. + +--- qdevelop-0.28.orig/src/build.h ++++ qdevelop-0.28/src/build.h +@@ -56,7 +56,7 @@ private: + int m_warnings; + QString m_forceMode; + signals: +- void message(QString, QString=0); ++ void message(QString, QString=QString()); + protected slots: + void slotBuildMessages(); + void slotStopBuild(); +--- qdevelop-0.28.orig/src/textEdit.h ++++ qdevelop-0.28/src/textEdit.h +@@ -142,7 +142,7 @@ public: + void setMouseHidden( bool hidden ); + public slots: + void gotoLine( int line, bool moveTop ); +- void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=0, QTextDocument::FindFlags options=0, bool fromButton=false); ++ void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=QString(), QTextDocument::FindFlags options=0, bool fromButton=false); + void slotIndent(bool indent=true); + void slotUnindent(); + void comment(ActionComment action); diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index e79d84f26..e6e2387a5 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 52657 2011-07-26 22:56:39Z shusmann $ -# Maintainer: Stefan Husmann +# $Id: PKGBUILD 59377 2011-11-23 21:18:49Z andrea $ +# Maintainer: +# Contributor: Stefan Husmann # Contributor: TripleE pkgname=sword @@ -18,9 +19,10 @@ md5sums=('a7dc4456e20e915fec46d774b690e305' build() { cd "${srcdir}"/$pkgname-$pkgver - patch -p1 < $srcdir/curl.patch + patch -p1 -i $srcdir/curl.patch + cd $srcdir - [[ -d build ]] || mkdir build + mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -34,7 +36,7 @@ package() { # Ugly workarounds to fix a weird cmakelists.txt install -d "${pkgdir}"/usr/lib/sword - mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8 "${pkgdir}"/usr/lib/sword/ + mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8* "${pkgdir}"/usr/lib/sword/ cd "${srcdir}"/${pkgname}-${pkgver}/locales.d/ for file in *.conf; do diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 99a01a51a..9326ea1d5 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32627 2010-11-15 22:59:24Z lcarlier $ +# $Id: PKGBUILD 59309 2011-11-23 10:18:01Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Shahar Weiss @@ -12,8 +12,8 @@ arch=('i686' 'x86_64') depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'torcs-data') makedepends=('plib') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 \ - torcs.desktop \ +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 + torcs.desktop torcs-gcc.patch) md5sums=('978b908a42ff6bc235a791bba3fa66b9' '328e419e9f985c3e7b69924fe299330d' @@ -21,20 +21,15 @@ md5sums=('978b908a42ff6bc235a791bba3fa66b9' build() { cd $srcdir/$pkgname-${pkgver/_/-} - - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} + unset LDFLAGS ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib - make } package() { cd $srcdir/$pkgname-${pkgver/_/-} - make DESTDIR=${pkgdir} install - install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop - find ${pkgdir} -type d -exec chmod 755 {} \; } -- cgit v1.2.3-54-g00ecf