diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-06 16:55:35 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-06 16:55:35 -0500 |
commit | 317ab819612426664e8873043e084e022a77fbd6 (patch) | |
tree | 340ceeab475cc95476a2ec507bfb24299349395c | |
parent | fe11b3202f42438b286fed7452db4c95ff9c6d48 (diff) | |
parent | bc17340c07501e38eb75a85edbe864c6ba473cb4 (diff) |
Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre
-rw-r--r-- | libre/lirc-libre/PKGBUILD | 41 | ||||
-rw-r--r-- | libre/mc-libre/PKGBUILD | 34 | ||||
-rw-r--r-- | libre/mc-libre/fs36962.diff | 77 | ||||
-rw-r--r-- | libre/mc-libre/unar.in | 64 | ||||
-rw-r--r-- | libre/mcomix-libre/PKGBUILD | 5 | ||||
-rw-r--r-- | libre/ogre-libre/PKGBUILD | 7 | ||||
-rw-r--r-- | libre/ogre-libre/freetype.patch | 21 | ||||
-rw-r--r-- | libre/pacman-mirrorlist-libre/PKGBUILD | 17 | ||||
-rw-r--r-- | libre/stuntrally-data-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/stuntrally-data-libre/libre.patch | 6 | ||||
-rw-r--r-- | libre/xbmc-libre/PKGBUILD | 19 | ||||
-rw-r--r-- | pcr/aseprite/PKGBUILD | 33 | ||||
-rw-r--r-- | pcr/aseprite/aseprite.desktop | 9 | ||||
-rw-r--r-- | pcr/gimp-pcr/PKGBUILD | 58 | ||||
-rw-r--r-- | pcr/gimp-pcr/gimp.install | 12 | ||||
-rw-r--r-- | pcr/gimp-pcr/gnu.gpl | 19 | ||||
-rw-r--r-- | pcr/gimp-pcr/uri-backend-libcurl.patch | 77 | ||||
-rw-r--r-- | pcr/unittestpp/UnitTest++.h | 1 | ||||
-rw-r--r-- | pcr/youtube-dl-current/PKGBUILD | 4 |
19 files changed, 272 insertions, 242 deletions
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index dfb71cc51..dd48284fb 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 199003 2013-11-06 07:24:27Z tpowa $ +# $Id: PKGBUILD 200352 2013-11-26 23:19:29Z eric $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=65 +pkgrel=66 epoch=1 _extramodules=extramodules-3.12-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre>=3.12' 'linux-libre<3.13' 'linux-libre-headers>=3.12' 'linux-libre-headers<3.13' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre>=3.12' 'linux-libre<3.13' 'linux-libre-headers>=3.12' 'linux-libre-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -26,9 +26,19 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar lircm.service irexec.service lirc.tmpfiles) +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '9ee196bd03ea44af5a752fb0cc6ca96a' + '3deb02604b37811d41816e9b4385fcc3' + 'a9ab637e7207472e61e55a2fa75dc555' + '1847b9997685bc3ad2cf11bea4590a92' + '07131d117fcfe9dcd50c453c3a5e9531' + 'febf25c154a7d36f01159e84f26c2d9a') -build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" +prepare() { cd "${srcdir}/lirc-${pkgver}" patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" @@ -47,10 +57,16 @@ build() { -e 's/@X_LIBS@//g' \ -e 's/@X_PRE_LIBS@//g' \ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am + # fix for new automake #33497 sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac libtoolize autoreconf +} + +build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${srcdir}/lirc-${pkgver}" PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ @@ -62,7 +78,7 @@ build() { -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \ - -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile + -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile make } @@ -85,7 +101,7 @@ package_lirc-libre() { package_lirc-utils-libre() { pkgdesc="Linux Infrared Remote Control utils" - depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') + depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip') replaces=('lirc-utils') @@ -110,14 +126,3 @@ package_lirc-utils-libre() { # remove built modules rm -r "${pkgdir}/usr/lib/modules" } -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '9ee196bd03ea44af5a752fb0cc6ca96a' - '3deb02604b37811d41816e9b4385fcc3' - 'a9ab637e7207472e61e55a2fa75dc555' - '1847b9997685bc3ad2cf11bea4590a92' - '07131d117fcfe9dcd50c453c3a5e9531' - 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index ea1a990f6..8b555654e 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $ +# $Id: PKGBUILD 101948 2013-12-02 21:12:10Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,9 +6,9 @@ _pkgname=mc pkgname=mc-libre -pkgver=4.8.10 -pkgrel=2.1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar support and arj recommendation included and nonfree unace recommendation removed" +pkgver=4.8.11 +pkgrel=1 +pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar recommendation removed" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" license=('GPL') @@ -32,7 +32,6 @@ optdepends=( 'python2-pytz: s3+ extfs' 'smb: VFS support' 'arj: uarj extfs' - 'unar: urar extfs' 'zip: uzip extfs' 'p7zip: support for 7zip archives') conflicts=('mc') @@ -46,30 +45,11 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/mc.keymap' 'etc/mc/mc.menu' 'etc/mc/sfs.ini') -source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2" - "fs36962.diff" - "unar.in") - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - ## add unar support removing nonfree urar on the source - rm -v src/vfs/extfs/helpers/urar.in - install -m644 $srcdir/unar.in src/vfs/extfs/helpers - sed -i '\|rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null|d - s| unrar v -c-|unar| - ' misc/ext.d/archive.sh - sed -i 's|urar.in|unar.in|g' $(grep -rlI 'urar.in') - sed -i '\|src/vfs/extfs/helpers/urar| s|urar|unar|g - ' configure{,.ac} - sed -i 's|urar|unar|g' src/vfs/extfs/helpers/Makefile.{am,in} -} +source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") build() { cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 < "${srcdir}/fs36962.diff" - ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \ --with-x --libexecdir=/usr/lib @@ -89,6 +69,4 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('eb4bdc23abd4fdfa14911d53d65c8186' - '7f7cf5388a5390c2ed49965492f490aa' - 'f549a6c13ac0c3052986fcdc945648a9') +md5sums=('7262788c0e799393cd37318b43a14adc') diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff deleted file mode 100644 index 0db5ed42b..000000000 --- a/libre/mc-libre/fs36962.diff +++ /dev/null @@ -1,77 +0,0 @@ -diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c ---- mc-4.8.10-orig/src/filemanager/file.c 2013-08-02 22:02:40.000000000 +0400 -+++ mc-4.8.10/src/filemanager/file.c 2013-09-17 09:59:30.699635407 +0400 -@@ -1272,8 +1272,8 @@ - - /** Initialize variables for progress bars */ - static FileProgressStatus --panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source, -- FileOpContext * ctx, filegui_dialog_type_t dialog_type) -+panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx, -+ filegui_dialog_type_t dialog_type) - { - FileProgressStatus status; - -@@ -1282,7 +1282,7 @@ - return FILE_CONT; - #endif - -- if (operation != OP_MOVE && verbose && file_op_compute_totals) -+ if (verbose && file_op_compute_totals) - { - ComputeDirSizeUI *ui; - -@@ -2378,13 +2378,6 @@ - mc_refresh (); - if (ctx->erase_at_end) - { -- /* remove files after move */ -- if (erase_list != NULL) -- { -- file_op_context_destroy_ui (ctx); -- file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM); -- } -- - while (erase_list != NULL && return_status != FILE_ABORT) - { - struct link *lp = (struct link *) erase_list->data; -@@ -2792,14 +2785,12 @@ - { - if (operation == OP_DELETE) - dialog_type = FILEGUI_DIALOG_DELETE_ITEM; -+ else if (single_entry && S_ISDIR (selection (panel)->st.st_mode)) -+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; -+ else if (single_entry || force_single) -+ dialog_type = FILEGUI_DIALOG_ONE_ITEM; - else -- { -- dialog_type = ((operation != OP_COPY) || single_entry || force_single) -- ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM; -- -- if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode)) -- dialog_type = FILEGUI_DIALOG_MULTI_ITEM; -- } -+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; - } - - /* Initialize things */ -@@ -2844,8 +2835,8 @@ - else - source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL); - #endif /* WITH_FULL_PATHS */ -- if (panel_operate_init_totals -- (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT) -+ if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) -+ == FILE_CONT) - { - if (operation == OP_DELETE) - { -@@ -2936,7 +2927,7 @@ - goto clean_up; - } - -- if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT) -+ if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT) - { - /* Loop for every file, perform the actual copy operation */ - for (i = 0; i < panel->count; i++) diff --git a/libre/mc-libre/unar.in b/libre/mc-libre/unar.in deleted file mode 100644 index 3ba37b019..000000000 --- a/libre/mc-libre/unar.in +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh - -UNAR=`which unar 2>/dev/null` - -# Define $UNAR version -UNAR_VERSION=`$UNAR -v` - -mcunar4fs_list () -{ - $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' -BEGIN { flag=0 } -/^-------/ { flag++; if (flag > 1) exit 0; next } -flag==1 { - str = substr($0, 2) - getline - split($4, a, "-") - if (index($6, "D") != 0) - $6="drwxr-xr-x" - else - if (index($6, ".") != 0) - $6="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str -}' -} - -mcunarfs_list () -{ - $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' -BEGIN { flag=0 } -/^-----------/ { flag++; if (flag > 1) exit 0; next } -flag==1 { - split($5, a, "-") - if (index($1, "D") != 0) - $1="drwxr-xr-x" - else - if (index($1, ".") != 0) - $1="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8 -}' -} - -mcunarfs_list () -{ - mcunarfs_list "$@" -} - -mcunarfs_copyout () -{ - $UNAR -q "$1" "$2" > "$3" -} - -umask 077 - -cmd="$1" -shift - -case "$cmd" in - # Workaround for a bug in mc - directories must precede files to - # avoid duplicate entries, so we sort output by filenames - list) mcunarfs_list "$@" | sort -k 8 ;; - copyout) mcunarfs_copyout "$@" ;; - *) exit 1 ;; -esac -exit 0 diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index d55f4c329..78104354f 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -6,15 +6,14 @@ _pkgname=mcomix pkgname=mcomix-libre pkgver=1.00 -pkgrel=5 -pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation" +pkgrel=5.1 +pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" license=('GPL') depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \ 'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools') makedepends=('gettext' 'intltool') -optdepends=('unar: for rar compressed comics') conflicts=('mcomix' 'comix') replaces=('mcomix' 'comix') provides=("mcomix=${pkgver}") diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index 5c9f05e90..3cae7fc96 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -14,7 +14,7 @@ pkgname=( #$_bldname-addon-$pkgbase # package unstable ) pkgver=1.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' arch=( mips64el @@ -27,7 +27,6 @@ depends=( boost-libs freeimage freetype2 - gcc-go glu libxaw libxrandr @@ -46,18 +45,14 @@ makedepends=( ) source=( ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} - freetype.patch ) sha512sums=( SKIP - a4bb1f263895110a65e2a2d9cd9c82a15953ed3b8ba3922bb75e29d5cd24376b089b02caaccdd3e314011d0a3209706574216de34558d77686005e31f66ff54c ) build() { cd ${pkgbase} - patch -Np1 < $srcdir/freetype.patch - # get a clean build dir [[ -d build ]] && rm -vrf build mkdir -v build && cd build diff --git a/libre/ogre-libre/freetype.patch b/libre/ogre-libre/freetype.patch deleted file mode 100644 index d98dc9f1b..000000000 --- a/libre/ogre-libre/freetype.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -r 538b33f531b5 CMake/Packages/FindFreetype.cmake ---- a/CMake/Packages/FindFreetype.cmake Sun Nov 24 00:46:46 2013 -0600 -+++ b/CMake/Packages/FindFreetype.cmake Tue Nov 26 12:56:17 2013 +0100 -@@ -31,7 +31,7 @@ - FREETYPE_INCLUDE_DIR - ) - --set(FREETYPE_LIBRARY_NAMES freetype2501 freetype250 freetype2412 freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype) -+set(FREETYPE_LIBRARY_NAMES freetype251 freetype2501 freetype250 freetype2412 freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype) - get_debug_names(FREETYPE_LIBRARY_NAMES) - - use_pkgconfig(FREETYPE_PKGC freetype2) -@@ -43,7 +43,7 @@ - findpkg_framework(FREETYPE) - message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") - --find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) -+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) - find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) - - find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD index b2507af21..0b1ed8fad 100644 --- a/libre/pacman-mirrorlist-libre/PKGBUILD +++ b/libre/pacman-mirrorlist-libre/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 88892 2010-08-26 04:28:34Z dan $ +# $Id: PKGBUILD 193769 2013-08-30 15:44:51Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> pkgname=pacman-mirrorlist-libre -pkgver=$(date +%Y%m%d) +pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman" arch=('any') @@ -11,16 +12,14 @@ url="https://repo.parabolagnulinux.org/mirrorlist.txt" license=('GPL') groups=('base') backup=(etc/pacman.d/mirrorlist) -source=(mirrorlist::${url}) +source=(mirrorlist-${pkgver}.txt::${url}) conflicts=(pacman-mirrorlist) replaces=(pacman-mirrorlist) provides=(pacman-mirrorlist) -md5sums=('16ae993e6145aeaa435318386a057482') -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - -build() { +package() { mkdir -p $pkgdir/etc/pacman.d - install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/ + install -m644 $srcdir/mirrorlist-${pkgver}.txt $pkgdir/etc/pacman.d/mirrorlist } + +md5sums=('d9611e055969ee109b56026ed06e4919') diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD index 31830f197..338fc5d7a 100644 --- a/libre/stuntrally-data-libre/PKGBUILD +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -3,7 +3,7 @@ pkgname=stuntrally-data-libre _pkgname=stuntrally-data -pkgver=2.1 +pkgver=2.2.1 pkgrel=1 pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files" arch=('any') @@ -16,9 +16,9 @@ source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/arch replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver -sha256sums=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0' - 'a1ab9b11d9f5b6c4aa8e5a9028f5994e21446d96fda5762e427365e21cfe3d0e' - '8cf24da76bed18fd03a3166ba8b8da93be87a7e49b8aebe4135b8e0b1a36eb8a') +sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51' + '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565' + '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64') prepare() { # patch some data files and remove nonfree data files cd "${srcdir}/stuntrally-${pkgver}/" @@ -56,7 +56,7 @@ build() { } package() { - #install the sources + # install the sources cd "${srcdir}/stuntrally-${pkgver}/build/" make DESTDIR="${pkgdir}" install diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch index f7f176a77..d55a4e54a 100644 --- a/libre/stuntrally-data-libre/libre.patch +++ b/libre/stuntrally-data-libre/libre.patch @@ -1,13 +1,13 @@ diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index eb7fc89..d1b670f 100644 +index c43ef18..aa6373e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) # Install data files # TODO: make this use all data/* subdirs without tracks, not entered by hand .. --foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2) -+foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees) +-foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s skies skies_s sounds terrain terrain2 trees-old trees trees2) ++foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s skies skies_s sounds terrain2 trees-old trees) install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL}) endforeach() diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index b0771a4d7..1caf395fc 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101633 2013-11-29 15:58:38Z spupykin $ +# $Id: PKGBUILD 102069 2013-12-04 16:20:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -10,7 +10,7 @@ _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre pkgver=12.2 -pkgrel=8 +pkgrel=9 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -36,17 +36,25 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "xbmc.service" - "polkit.rules") + "polkit.rules" + "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") md5sums=('489f3877decae4e265ece54f9eaef0ba' '8312d6d4ac5d7c3d9eed40ab08a17d3b' - 'd4cbb6609c8e7b713c714241f529000e') + 'd4cbb6609c8e7b713c714241f529000e' + '7fd6399d2ffbdf06b724f0cc2efa0784') -build() { +prepare() { cd "${srcdir}/xbmc-$pkgver" + patch -p0 <$srcdir/libass.patch + # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp +} + +build() { + cd "${srcdir}/xbmc-$pkgver" # Bootstrapping XBMC ./bootstrap @@ -114,5 +122,6 @@ package() { install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules + chmod 0700 $pkgdir/etc/polkit-1/rules.d/ } # vim:set ts=2 sw=2 et: diff --git a/pcr/aseprite/PKGBUILD b/pcr/aseprite/PKGBUILD new file mode 100644 index 000000000..bf0052363 --- /dev/null +++ b/pcr/aseprite/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Benoit Favre <benoit.favre@gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> + +pkgname=aseprite +pkgver=0.9.5 +pkgrel=3 +pkgdesc='Create animated sprites and pixel art' +arch=('x86_64' 'i686') +url='http://www.aseprite.org/' +license=('GPL') +depends=('allegro') +makedepends=('cmake') +source=("http://aseprite.googlecode.com/files/$pkgname-$pkgver.zip" aseprite.desktop) +sha256sums=('ce4f1e011744f9a5927a5341fccc3938b67f15f6a66d5df6b4282c5498fb8fd5' 'c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa') + +build() { + cd "$pkgname-$pkgver" + + cmake -DCMAKE_INSTALL_PREFIX:STRING=/usr . + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "data/icons/ase48.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/aseprite/aseprite.desktop b/pcr/aseprite/aseprite.desktop new file mode 100644 index 000000000..b000fa018 --- /dev/null +++ b/pcr/aseprite/aseprite.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Aseprite +Comment=Pixel-art paint program +Exec=aseprite +Terminal=false +Categories=Graphics;2DGraphics;RasterGraphics +Icon=aseprite diff --git a/pcr/gimp-pcr/PKGBUILD b/pcr/gimp-pcr/PKGBUILD new file mode 100644 index 000000000..75b54f27a --- /dev/null +++ b/pcr/gimp-pcr/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 198811 2013-11-05 16:40:29Z bpiotrowski $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +_pkgname=gimp +pkgname=$_pkgname-pcr +pkgver=2.8.10 +pkgrel=1 +pkgdesc="GNU Image Manipulation Program" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gimp.org/" +license=('GPL' 'LGPL') +depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ + 'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl') +makedepends=('intltool' 'webkitgtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript') +optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' + 'webkitgtk2: for the help browser' + 'poppler-glib: for pdf support' + 'alsa-lib: for MIDI event controller module' + 'curl: for URI support' + 'ghostscript: for postscript support') +options=('!makeflags') +provides=("$_pkgname") +conflicts=('gimp-devel' "$_pkgname") +install=gimp.install +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2 gnu.gpl + uri-backend-libcurl.patch) +md5sums=('84c964aab7044489af69f7319bb59b47' + '2d823a7e7cd7f99b681943e42bfb7d40' + 'e894f4b2ffa92c71448fdd350e9b78c6') + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # fixing freetype header path file + sed -i "s|freetype/tttables[.]h|freetype2/tttables.h|" app/text/${_pkgname}font.c +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + #patch -p1 < ../uri-backend-libcurl.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-mp --enable-gimp-console --enable-gimp-remote \ + --enable-python --with-gif-compression=lzw --with-libcurl \ + --without-aa --without-hal --without-gvfs --without-gnomevfs + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py + install -D -m644 "${srcdir}/gnu.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/GNU.gpl" + + rm "${pkgdir}/usr/share/man/man1/gimp-console.1" + ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" + ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" + ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" +} diff --git a/pcr/gimp-pcr/gimp.install b/pcr/gimp-pcr/gimp.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/pcr/gimp-pcr/gimp.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/gimp-pcr/gnu.gpl b/pcr/gimp-pcr/gnu.gpl new file mode 100644 index 000000000..e7ce2b288 --- /dev/null +++ b/pcr/gimp-pcr/gnu.gpl @@ -0,0 +1,19 @@ +GIMP Palette +Name: gnu +# + 0 0 0 + 0 0 170 + 0 170 0 + 0 170 170 +170 0 0 +170 0 170 +170 85 0 +170 170 170 + 85 85 85 + 85 85 255 + 85 255 85 + 85 255 255 +255 85 85 +255 85 255 +255 255 85 +255 255 255 diff --git a/pcr/gimp-pcr/uri-backend-libcurl.patch b/pcr/gimp-pcr/uri-backend-libcurl.patch new file mode 100644 index 000000000..85da2fc7f --- /dev/null +++ b/pcr/gimp-pcr/uri-backend-libcurl.patch @@ -0,0 +1,77 @@ +diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c +--- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 ++++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 +@@ -4,9 +4,9 @@ + * libcurl backend for the URI plug-in + * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org> + * +- * This program is free software; you can redistribute it and/or modify ++ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or ++ * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, +@@ -15,8 +15,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + #include "config.h" +@@ -24,7 +23,6 @@ + #include <errno.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <glib/gstdio.h> +@@ -63,7 +61,7 @@ + + vinfo = curl_version_info (CURLVERSION_NOW); + +- protocols = g_string_new ("http:,ftp:"); ++ protocols = g_string_new ("http:,ftp:,gopher:"); + + if (vinfo->features & CURL_VERSION_SSL) + { +@@ -153,7 +151,7 @@ + FILE *out_file; + CURL *curl_handle; + CURLcode result; +- gint response_code; ++ glong response_code; + + gimp_progress_init (_("Connecting to server")); + +@@ -195,12 +193,12 @@ + + curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); + +- if (response_code != 200) ++ if (response_code != 200 && response_code != 226 && response_code != 0) + { + fclose (out_file); + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Opening '%s' for reading resulted in HTTP " +- "response code: %d"), ++ "response code: %ld"), + uri, response_code); + curl_easy_cleanup (curl_handle); + return FALSE; +@@ -224,3 +222,10 @@ + + return FALSE; + } ++ ++gchar * ++uri_backend_map_image (const gchar *uri, ++ GimpRunMode run_mode) ++{ ++ return NULL; ++} diff --git a/pcr/unittestpp/UnitTest++.h b/pcr/unittestpp/UnitTest++.h deleted file mode 100644 index 6c0771a0d..000000000 --- a/pcr/unittestpp/UnitTest++.h +++ /dev/null @@ -1 +0,0 @@ -#include "UnitTest++/UnitTest++.h" diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 2d0046f1e..19810d1c1 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.12.03 +pkgver=2013.12.04 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('54f68459d5463d7cde0379a2b9394734' +md5sums=('b0db9d5bfe29b23425847f8cc90dd9be' 'SKIP') |