diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
| commit | a4f3ca8891e50241ac2ca144949e92b26920ffaf (patch) | |
| tree | d31841075429e437c4908580e8ec074f2fe40aa5 /community/bbpager | |
| parent | 3156702a5deccd61451be9f7d8ba0fd212a3043b (diff) | |
| parent | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-ca/PKGBUILD
community/corkscrew/PKGBUILD
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/libxi/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/mpc/PKGBUILD
extra/poppler/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/vte3/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
multilib/lib32-libxft/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/grep/PKGBUILD
testing/sudo/PKGBUILD
testing/xf86-input-joystick/PKGBUILD
testing/xf86-input-wacom/PKGBUILD
Diffstat (limited to 'community/bbpager')
| -rw-r--r-- | community/bbpager/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/bbpager/fix-linking-ugly.diff | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/community/bbpager/PKGBUILD b/community/bbpager/PKGBUILD index 9440101d6..69b459b6b 100644 --- a/community/bbpager/PKGBUILD +++ b/community/bbpager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 21749 2010-07-17 08:54:37Z lcarlier $ +# $Id: PKGBUILD 67447 2012-03-11 20:35:17Z lcarlier $ # Maintainer: Thayer Williams <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=bbpager pkgver=0.4.7 -pkgrel=3 +pkgrel=4 pkgdesc="A dockable pager for Blackbox and other window managers" arch=(i686 x86_64 'mips64el') url="http://bbtools.sourceforge.net/download.php?file=6" @@ -13,16 +13,16 @@ depends=('gcc-libs' 'libxft' 'libxext') makedepends=('gcc' 'blackbox') source=(http://downloads.sourceforge.net/bbtools/$pkgname-$pkgver.tar.gz \ 02_gcc43.dpatch \ - fix-shm-linking-ugly.diff) + fix-linking-ugly.diff) md5sums=('4eaa91a4d66130af2f7a09c25f917386' 'e985ef893f2080b3b2d47f900f861352' - '6e0b3915ff2f61ac3bab7434c93f37b3') + 'd2258a0cfb580e20869574f373fe7ed4') build() { cd ${srcdir}/$pkgname-$pkgver patch -Np1 -i ../02_gcc43.dpatch - patch -Np1 -i ../fix-shm-linking-ugly.diff + patch -Np1 -i ../fix-linking-ugly.diff autoreconf ./configure --prefix=/usr diff --git a/community/bbpager/fix-linking-ugly.diff b/community/bbpager/fix-linking-ugly.diff new file mode 100644 index 000000000..ff0a5dcf7 --- /dev/null +++ b/community/bbpager/fix-linking-ugly.diff @@ -0,0 +1,12 @@ +diff -U 3 -d -r -N -- bbpager-0.4.7/configure.ac bbpager-0.4.7b/configure.ac +--- bbpager-0.4.7/configure.ac 2008-01-14 18:03:50.000000000 +0100 ++++ bbpager-0.4.7b/configure.ac 2010-07-17 10:36:04.042040059 +0200 +@@ -68,7 +68,7 @@ + dnl pkgconfig checks for blackbox library + PKG_CHECK_MODULES(LIBBT, libbt) + CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS" +-LIBS="$LIBS $LIBBT_LIBS" ++LIBS="$LIBS $LIBBT_LIBS -lXext -lX11" + + dnl generate the config header + AM_CONFIG_HEADER(config.h) |