From 8f4f6fea0e8f06647b3e06c003069c93b5b033b4 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 Apr 2011 04:14:07 +0000 Subject: Tue Apr 19 04:14:07 UTC 2011 --- community-testing/gnustep-back/PKGBUILD | 12 ++--- community-testing/gnustep-base/PKGBUILD | 13 +++--- community-testing/gnustep-gui/PKGBUILD | 12 ++--- community-testing/gnustep-make/ChangeLog | 2 + community-testing/gnustep-make/PKGBUILD | 26 +++++++++++ community-testing/gpsdrive/PKGBUILD | 69 +++++++++++++++++++++++++++++ community-testing/gpsdrive/gpsd-2.96.patch | 44 ++++++++++++++++++ community-testing/gpsdrive/gpsdrive.install | 4 ++ community-testing/shotwell/PKGBUILD | 4 +- community-testing/shotwell/shotwell.install | 4 +- community-testing/uzbl/PKGBUILD | 8 ++-- community-testing/viking/PKGBUILD | 38 ++++++++++++++++ community-testing/viking/gpsd-2.96.patch | 47 ++++++++++++++++++++ community-testing/viking/viking.changelog | 6 +++ community-testing/viking/viking.install | 11 +++++ 15 files changed, 272 insertions(+), 28 deletions(-) create mode 100644 community-testing/gnustep-make/ChangeLog create mode 100644 community-testing/gnustep-make/PKGBUILD create mode 100644 community-testing/gpsdrive/PKGBUILD create mode 100644 community-testing/gpsdrive/gpsd-2.96.patch create mode 100644 community-testing/gpsdrive/gpsdrive.install create mode 100644 community-testing/viking/PKGBUILD create mode 100644 community-testing/viking/gpsd-2.96.patch create mode 100644 community-testing/viking/viking.changelog create mode 100644 community-testing/viking/viking.install (limited to 'community-testing') diff --git a/community-testing/gnustep-back/PKGBUILD b/community-testing/gnustep-back/PKGBUILD index 60ad92dd8..4755f9e02 100644 --- a/community-testing/gnustep-back/PKGBUILD +++ b/community-testing/gnustep-back/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44425 2011-04-07 13:07:37Z spupykin $ +# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: Sebastian Sareyko pkgname=gnustep-back -pkgver=20110407 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64') @@ -14,13 +14,13 @@ depends=(libgl libxmu gcc-libs freetype2 libart-lgpl) makedepends=('gnustep-gui' 'libffi' 'gcc-objc') conflicts=('gnustep-back-svn') groups=('gnustep-core') -#source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/gnustep/$pkgname-$pkgver.tar.xz) -md5sums=('1fd61a518b610342503239aa6cbf2d25') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('a28ba696419eeab17f14c2a75b21c3a7') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/opt/GNUstep + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep make make DESTDIR=$pkgdir install } diff --git a/community-testing/gnustep-base/PKGBUILD b/community-testing/gnustep-base/PKGBUILD index 57ec54df7..556c873d5 100644 --- a/community-testing/gnustep-base/PKGBUILD +++ b/community-testing/gnustep-base/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44429 2011-04-07 13:08:22Z spupykin $ +# $Id: PKGBUILD 45211 2011-04-18 12:45:17Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: Sebastian Sareyko pkgname=gnustep-base -pkgver=20110407 +pkgver=1.22.0 pkgrel=1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64') @@ -15,16 +15,13 @@ makedepends=(gcc-objc) conflicts=('gnustep-base-svn') groups=('gnustep-core') options=('!emptydirs' '!makeflags') -#source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/gnustep/$pkgname-$pkgver.tar.xz) -md5sums=('16e4012a0ac0967157ded1b803be21dc') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('7faab4891ae6c1e7a6c806d6da368410') build() { cd $srcdir/$pkgname-$pkgver source /etc/profile.d/GNUstep.sh - # need this stupid hack - mkdir -p $pkgdir/opt/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones - ./configure --prefix=/opt/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ # fix file ownership sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble make VERBOSE=1 diff --git a/community-testing/gnustep-gui/PKGBUILD b/community-testing/gnustep-gui/PKGBUILD index 95c38b3b0..a9ea47daf 100644 --- a/community-testing/gnustep-gui/PKGBUILD +++ b/community-testing/gnustep-gui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44431 2011-04-07 13:09:19Z spupykin $ +# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: Sebastian Sareyko pkgname=gnustep-gui -pkgver=20110407 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64') @@ -15,13 +15,13 @@ makedepends=(gcc-objc) conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') -#source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/gnustep/$pkgname-$pkgver.tar.xz) -md5sums=('f4ca11690dc2fb1f47c769108a39b74e') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/opt/GNUstep --disable-gsnd + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep make make DESTDIR=$pkgdir install } diff --git a/community-testing/gnustep-make/ChangeLog b/community-testing/gnustep-make/ChangeLog new file mode 100644 index 000000000..15622ab88 --- /dev/null +++ b/community-testing/gnustep-make/ChangeLog @@ -0,0 +1,2 @@ +2007-06-27 tardo +* version upgrade diff --git a/community-testing/gnustep-make/PKGBUILD b/community-testing/gnustep-make/PKGBUILD new file mode 100644 index 000000000..e7edf7dff --- /dev/null +++ b/community-testing/gnustep-make/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 45214 2011-04-18 12:46:00Z spupykin $ +# Maintainer: Vesa Kaihlavirta +# Contributor: Sebastian Sareyko + +pkgname=gnustep-make +pkgver=2.6.0 +pkgrel=1 +pkgdesc="The GNUstep make package" +arch=(i686 x86_64) +url="http://www.gnustep.org/" +license=('GPL') +depends=('glibc') +conflicts=('gnustep-make-svn') +groups=('gnustep-core') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('71a6c6d9a0b341495e67c915fe6722c1') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install + install -D -m755 \ + $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ + $pkgdir/etc/profile.d/GNUstep.sh +} diff --git a/community-testing/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD new file mode 100644 index 000000000..e95ef92be --- /dev/null +++ b/community-testing/gpsdrive/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Tom Newsom +# Maintainer: damir + +pkgname=gpsdrive +pkgver=2.11 +pkgrel=7 +pkgdesc="A car (bike, ship, plane) navigation system" +arch=("i686" "x86_64") +url="http://www.gpsdrive.de/" +license=('GPL2') +depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' + 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' + 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' + ) # already in core ('sqlite3') +makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') +install="gpsdrive.install" +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') + +build() { + cd "$srcdir" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + rm -rf build + mkdir build + cd build + + # fix the mapnik default values + sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + + export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + # see DefineOptions.cmake for a list of common options and defaults + # cmake -L for a more in-depth listing + cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ + -DWITH_SCRIPTS=ON \ + -DWITH_MAPNIK=ON \ + -DWITH_POSTGIS=ON \ + -DWITH_GDAL=ON \ + -DWITH_BASEMAPS=ON \ + -DWITH_FRIENDSD=ON \ + -DWITH_KISMET=ON \ + -DWITH_NAVIGATION=ON \ + -DWITH_SPEECH=OFF \ + -DWITH_DBUS=OFF \ + -DLIBGPS_OLD=OFF \ + "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/gpsdrive/gpsd-2.96.patch b/community-testing/gpsdrive/gpsd-2.96.patch new file mode 100644 index 000000000..bc6c7475f --- /dev/null +++ b/community-testing/gpsdrive/gpsd-2.96.patch @@ -0,0 +1,44 @@ +diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c +--- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 ++++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 +@@ -264,7 +264,8 @@ + #define GPS_TIMER 500 + + static gint gps_timeout_source = 0; +-static struct gps_data_t *gpsdata; ++static struct gps_data_t __gd; ++static struct gps_data_t *gpsdata = &__gd; + + /* SYMBOLS USED IN LIBGPS: + * +@@ -410,9 +411,10 @@ + */ + gps_query (gpsdata, "oys\n"); + #else +- if (gps_waiting(gpsdata)) ++ if (gps_waiting(gpsdata, 1000000)) + { +- gps_poll (gpsdata); ++ gps_read (gpsdata); ++ gps_hook_cb(gpsdata, NULL); + } + #endif + +@@ -447,7 +449,7 @@ + } + + /* try to open connection */ +- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); ++ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; + if (!gpsdata) + { + g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", +@@ -466,7 +468,7 @@ + gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); + + /* set hook function to handle gps data */ +- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); ++// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); + + #ifndef LIBGPS_OLD + /* enable watch mode to get data stream from gpsd */ diff --git a/community-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install new file mode 100644 index 000000000..8ea63912e --- /dev/null +++ b/community-testing/gpsdrive/gpsdrive.install @@ -0,0 +1,4 @@ +post_install() { + echo "Don't forget to generate geoinfo.db with geoinfo.pl script" + echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" +} diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD index 0d7632363..ca9a49322 100644 --- a/community-testing/shotwell/PKGBUILD +++ b/community-testing/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44941 2011-04-13 08:58:03Z spupykin $ +# $Id: PKGBUILD 45192 2011-04-18 09:06:19Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer : Ionut Biru # Contributor: Joeny Ang pkgname=shotwell pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install index ceac19051..83c95a70f 100644 --- a/community-testing/shotwell/shotwell.install +++ b/community-testing/shotwell/shotwell.install @@ -7,7 +7,7 @@ post_install() { } pre_upgrade() { - pre_remove $1 + usr/sbin/gconfpkg --uninstall ${pkgname} } post_upgrade() { @@ -16,9 +16,9 @@ post_upgrade() { pre_remove() { usr/sbin/gconfpkg --uninstall ${pkgname} - update-desktop-database -q } post_remove() { + update-desktop-database -q gtk-update-icon-cache -fq -t usr/share/icons/hicolor } diff --git a/community-testing/uzbl/PKGBUILD b/community-testing/uzbl/PKGBUILD index 801d14d7d..82bbe2770 100644 --- a/community-testing/uzbl/PKGBUILD +++ b/community-testing/uzbl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 44541 2011-04-08 10:25:36Z lcarlier $ +# $Id: PKGBUILD 45245 2011-04-18 20:59:54Z lcarlier $ # Maintainer : Laurent Carlier # Contributor: Ionut Biru # Contributor: Dieter Plaetinck pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') -pkgver=2011.03.17 +pkgver=2011.04.12 pkgrel=2 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13') source=(uzbl-$pkgver.tar.gz::http://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('fffd69136e0c4a9dce8875e776f7e97e') +md5sums=('27e82c838b8136dafb0683fa52ffc701') build() { cd "$srcdir"/Dieterbe-uzbl-* @@ -30,7 +30,7 @@ build() { package_uzbl-core() { pkgdesc="Webpage interface component meant for integration with other tools and scripts" - depends=('libwebkit') + depends=('libwebkit>=1.3.13') optdepends=('socat: to interface with the socket' 'dmenu: to run some of the example scripts' 'zenity: to run some of the example scripts' 'python2: to run some of the example scripts' diff --git a/community-testing/viking/PKGBUILD b/community-testing/viking/PKGBUILD new file mode 100644 index 000000000..6f73fc6ef --- /dev/null +++ b/community-testing/viking/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 45239 2011-04-18 13:40:23Z spupykin $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Nick Østergaard +# Contributor: Jonny Gerold + +pkgname=viking +pkgver=1.1 +pkgrel=2 +pkgdesc="GTK+2 application to manage GPS data" +arch=('i686' 'x86_64') +url="http://viking.sourceforge.net/" +license=('GPL2') +depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('gpsbabel: for GPS management') +options=('!emptydirs') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/viking/$pkgname-$pkgver.tar.gz + gpsd-2.96.patch) +sha256sums=('5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743' + '7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + patch -p1 <$srcdir/gpsd-2.96.patch + autoreconf + + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/viking/gpsd-2.96.patch b/community-testing/viking/gpsd-2.96.patch new file mode 100644 index 000000000..01b117312 --- /dev/null +++ b/community-testing/viking/gpsd-2.96.patch @@ -0,0 +1,47 @@ +diff -wbBur viking-1.1/configure.ac viking-1.1.my/configure.ac +--- viking-1.1/configure.ac 2011-02-08 21:29:01.000000000 +0000 ++++ viking-1.1.my/configure.ac 2011-04-18 13:31:07.000000000 +0000 +@@ -244,7 +244,7 @@ + [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes]) + case $ac_cv_enable_realtimegpstracking in + yes) +- AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) ++ AC_CHECK_LIB(gps,gps_read,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) + AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF]) + ;; + esac +diff -wbBur viking-1.1/src/vikgpslayer.c viking-1.1.my/src/vikgpslayer.c +--- viking-1.1/src/vikgpslayer.c 2011-02-08 21:09:00.000000000 +0000 ++++ viking-1.1.my/src/vikgpslayer.c 2011-04-18 13:35:48.000000000 +0000 +@@ -1377,8 +1377,11 @@ + { + VikGpsLayer *vgl = data; + if (condition == G_IO_IN) { +- if (!gps_poll(&vgl->vgpsd->gpsd)) ++ if (!gps_read(&vgl->vgpsd->gpsd)) ++ { ++ gpsd_raw_hook(&vgl->vgpsd->gpsd, NULL); + return TRUE; ++ } + else { + g_warning("Disconnected from gpsd. Trying to reconnect"); + rt_gpsd_disconnect(vgl); +@@ -1408,7 +1411,8 @@ + { + VikGpsLayer *vgl = (VikGpsLayer *)data; + #ifndef HAVE_GPS_OPEN_R +- struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); ++ static struct gps_data_t __gd; ++ struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port, &__gd) ? NULL : &__gd; + + if (gpsd == NULL) { + #else +@@ -1439,7 +1443,7 @@ + vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); + } + +- gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); ++// gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); + vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); + vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); diff --git a/community-testing/viking/viking.changelog b/community-testing/viking/viking.changelog new file mode 100644 index 000000000..d38e25a9e --- /dev/null +++ b/community-testing/viking/viking.changelog @@ -0,0 +1,6 @@ +2011-02-23 Jaroslav Lichtblau + * gebabbel 1.1-1 + +2011-02-06 Jaroslav Lichtblau + * gebabbel 1.0.2-2 + * moved to [community] with 62 AUR votes diff --git a/community-testing/viking/viking.install b/community-testing/viking/viking.install new file mode 100644 index 000000000..8de1998bf --- /dev/null +++ b/community-testing/viking/viking.install @@ -0,0 +1,11 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3-54-g00ecf