diff options
Diffstat (limited to 'abs/core')
-rw-r--r-- | abs/core/libdrm/PKGBUILD | 30 | ||||
-rw-r--r-- | abs/core/libx11/PKGBUILD | 33 | ||||
-rw-r--r-- | abs/core/libx11/xorg.csh | 15 | ||||
-rw-r--r-- | abs/core/libx11/xorg.sh | 4 | ||||
-rw-r--r-- | abs/core/libxt/PKGBUILD | 14 | ||||
-rw-r--r-- | abs/core/libxxf86vm/PKGBUILD | 19 | ||||
-rw-r--r-- | abs/core/pacman/PKGBUILD | 39 | ||||
-rw-r--r-- | abs/core/pacman/makepkg.conf | 9 | ||||
-rw-r--r-- | abs/core/pacman/pacman.conf | 4 | ||||
-rw-r--r-- | abs/core/pacman/pacman.conf.x86_64 | 9 | ||||
-rw-r--r-- | abs/core/pacman/pacman.install | 29 |
11 files changed, 116 insertions, 89 deletions
diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index c3b2c6d..b93c2dd 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86650 2010-08-02 19:36:00Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.23 +pkgver=2.4.25 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('custom') depends=('glibc') options=('!libtool') @@ -13,26 +13,28 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) - +sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' + 'af2d9871565ea4cf524873f897691a18b2bba944' + 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') + build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - libtoolize --force - aclocal - autoconf - automake + +# libtoolize --force + autoreconf --force --install ./configure --prefix=/usr \ - --enable-intel --enable-radeon \ - --enable-vmwgfx-experimental-api --enable-nouveau-experimental-api \ - --enable-udev + --enable-udev \ + --enable-intel \ + --enable-radeon \ + --enable-vmwgfx-experimental-api \ + --enable-nouveau-experimental-api make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('7577ff36ec364d88fae466d4f7fc5fc6' - '9b5ec3bbebe86921e2057694c42f65b8' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD index 8d1c59d..af9afab 100644 --- a/abs/core/libx11/PKGBUILD +++ b/abs/core/libx11/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 88397 2010-08-23 08:25:08Z jgc $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.3.99.903 -pkgrel=1 +pkgver=1.4.3 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" -depends=('libxcb>=1.7' 'kbproto>=1.0.5') -makedepends=('xproto>=7.0.18' 'xextproto>=7.1.2' 'xf86bigfontproto>=1.2.0' 'xtrans>=1.2.5' 'inputproto>=2.0' 'xorg-util-macros>=1.10.0') +depends=('libxcb' 'xproto' 'kbproto') +makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') -license=('custom:XFREE86') +license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh) + xorg.sh + xorg.csh) +sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8' + '4b756387426afb2a5bb7a155631ec42348abf5c1' + '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') build() { cd "${srcdir}/libX11-${pkgver}" - ./configure --prefix=/usr \ - --with-xcb --disable-static - make || return 1 - make check || return 1 + ./configure --prefix=/usr --disable-static --disable-xf86bigfont + make + make check } + package() { cd "${srcdir}/libX11-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/xorg.sh" "${pkgdir}/etc/profile.d/" + install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - -md5sums=('3e8ed7a91f70bb819b5dab9c124a7062' - '942ff006e69e041f0307c1316e0dec5d') diff --git a/abs/core/libx11/xorg.csh b/abs/core/libx11/xorg.csh new file mode 100644 index 0000000..26c49a2 --- /dev/null +++ b/abs/core/libx11/xorg.csh @@ -0,0 +1,15 @@ +setenv XDG_DATA_HOME ${HOME}/.local/share +setenv XDG_CONFIG_HOME ${HOME}/.config +setenv XDG_CACHE_HOME ${HOME}/.cache + +if (! ($?XDG_DATA_DIRS) ) then + setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/ +else + setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS} +endif + +if (! ($?XDG_CONFIG_DIRS) ) then + setenv XDG_CONFIG_DIRS /etc/xdg +else + setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} +endif diff --git a/abs/core/libx11/xorg.sh b/abs/core/libx11/xorg.sh index 9b37312..e1de686 100644 --- a/abs/core/libx11/xorg.sh +++ b/abs/core/libx11/xorg.sh @@ -3,9 +3,9 @@ export XDG_CONFIG_HOME=$HOME/.config export XDG_CACHE_HOME=$HOME/.cache if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/share:/usr/local/share + export XDG_DATA_DIRS=/usr/share/:/usr/local/share/ else - export XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS + export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS fi if [ -z $XDG_CONFIG_DIRS ]; then diff --git a/abs/core/libxt/PKGBUILD b/abs/core/libxt/PKGBUILD index 97c945f..a8126f0 100644 --- a/abs/core/libxt/PKGBUILD +++ b/abs/core/libxt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97817 2010-11-01 22:29:44Z jgc $ +# $Id$ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.0.9 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=(i686 x86_64) @@ -12,18 +12,14 @@ depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2) -sha1sums=('3222c028b37e70a1d0d88feba5e52c2408e6bd5c') +sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') build() { cd "${srcdir}/libXt-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 -} -package() { - cd "${srcdir}/libXt-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxxf86vm/PKGBUILD b/abs/core/libxxf86vm/PKGBUILD index 7d0f7d7..d652897 100644 --- a/abs/core/libxxf86vm/PKGBUILD +++ b/abs/core/libxxf86vm/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 54608 2009-10-11 11:43:26Z andyrtr $ +# $Id$ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxxf86vm -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libxext>=1.1' 'xf86vidmodeproto>=2.3') -makedepends=('pkgconfig') +depends=('libxext' 'xf86vidmodeproto') +makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -md5sums=('b431ad7084e1055fef99a9115237edd8') +sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') build() { cd "${srcdir}/libXxf86vm-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 2d4f776..59ff582 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 89780 2010-09-04 01:05:26Z dan $ +# $Id$ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=pacman -pkgver=3.4.1 -pkgrel=3 +pkgver=3.5.3 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') -depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') optdepends=('fakeroot: for makepkg usage as normal user' 'curl: for rankmirrors usage') backup=(etc/pacman.conf etc/makepkg.conf) @@ -19,44 +19,43 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 makepkg.conf) +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' + 'e99eb721b6b704f68c5f47468507c102' + 'f8b939d9b2beb79a0436961a2d707d7c' + 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc - make || return 1 + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc + make } package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + make DESTDIR=$pkgdir install # install Arch specific stuff mkdir -p $pkgdir/etc case "$CARCH" in i686) install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf - ;; - x86_64) - install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf - ;; - esac - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ - # set things correctly in the default conf file - case "$CARCH" in - i686) mycarch="i686" mychost="i686-pc-linux-gnu" myflags="-march=i686 " ;; x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" myflags="-march=x86-64 " ;; esac + install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file sed -i $pkgdir/etc/makepkg.conf \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ @@ -70,7 +69,7 @@ package() { } # vim: set ts=2 sw=2 et: -md5sums=('4e4e8e4f636d9878fbed9cf840f162cf' - '4792e61cd1b902d20046e19f97ae758d' - '9ba146b4fa7bcb3cc18204b06d1f6157' - 'aef317285c7d16ac495b0e53deeb948d') +md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' + '8f7e5462469cfc7520b3aade58ff28de' + 'f8b939d9b2beb79a0436961a2d707d7c' + 'a8684989d3dfad5a6e1bcf95af3e571b') diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf index ff08a0f..a655e93 100644 --- a/abs/core/pacman/makepkg.conf +++ b/abs/core/pacman/makepkg.conf @@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache) +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) # A negated environment option will do the opposite of the comments below. # #-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD # -BUILDENV=(fakeroot !distcc color !ccache) +BUILDENV=(fakeroot !distcc color !ccache check) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. @@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache) # Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- strip: Strip symbols from binaries/libraries #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages @@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug" MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if strip is specified) -STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) #-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf index c44d2e6..ae584e2 100644 --- a/abs/core/pacman/pacman.conf +++ b/abs/core/pacman/pacman.conf @@ -17,7 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ Architecture = auto #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES @@ -76,4 +77,3 @@ Include = /etc/pacman.d/mirrorlist # tips on creating your own repositories. #[custom] #Server = file:///home/custompkgs - diff --git a/abs/core/pacman/pacman.conf.x86_64 b/abs/core/pacman/pacman.conf.x86_64 index e825b4b..6f04236 100644 --- a/abs/core/pacman/pacman.conf.x86_64 +++ b/abs/core/pacman/pacman.conf.x86_64 @@ -17,7 +17,7 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - %u > %o +#XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled Architecture = auto @@ -33,6 +33,7 @@ Architecture = auto #ShowSize #UseDelta #TotalDownload +#CheckSpace # # REPOSITORIES @@ -73,7 +74,11 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repository here. +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + #[multilib] #Include = /etc/pacman.d/mirrorlist diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index 294222e..b735399 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -2,19 +2,28 @@ # arg 1: the new package version # arg 2: the old package version post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" } _resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" - # path variables + # path variables pacconf="/etc/pacman.conf" dbpath="/var/lib/pacman/local" @@ -50,4 +59,4 @@ _resetbackups() { echo ">>> -> $file is unowned." fi done -} +} |