Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre

8 files changed, 210 insertions, 3 deletions

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')