[arch-commits] Commit in gnac/trunk (PKGBUILD fix-build.patch gnac.install)

[Balló György]

    Date: Tuesday, July 12, 2016 @ 19:44:09
  Author: bgyorgy
Revision: 182707

upgpkg: gnac 0.2.4.1-4

Fix build

Added:
  gnac/trunk/fix-build.patch
Modified:
  gnac/trunk/PKGBUILD
Deleted:
  gnac/trunk/gnac.install

-----------------+
 PKGBUILD        |   10 +++++++---
 fix-build.patch |   25 +++++++++++++++++++++++++
 gnac.install    |   18 ------------------
 3 files changed, 32 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-12 19:30:25 UTC (rev 182706)
+++ PKGBUILD	2016-07-12 19:44:09 UTC (rev 182707)
@@ -3,26 +3,30 @@
 
 pkgname=gnac
 pkgver=0.2.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Audio converter for GNOME"
 arch=('i686' 'x86_64')
 url="http://gnac.sourceforge.net/"
 license=('GPL')
-depends=('libnotify' 'libunique3' 'gst-plugins-base' 'dconf' 'desktop-file-utils')
+depends=('libnotify' 'libunique3' 'gst-plugins-base')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
 optdepends=('gst-plugins-good: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'            
             'gst-plugins-ugly: Extra media codecs'
             'gst-libav: Extra media codecs')
-install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+        fix-build.patch
         gstreamer-1.0.patch)
 sha256sums=('8f9c4731bbc40fde57c311a2a7fabe4e3200198abfe7415c659b98a2d54869da'
+            'a7a8cc9d3cc9408776e64be50beb7c48cc1a3d9499cb98e2dac5f45a151475ac'
             '57331aaf1987e8920594a4a753bed2c719d2152c7448ab53ba09ec208521abae')
 
 prepare() {
   cd $pkgname-$pkgver
 
+  # Fix build
+  patch -Np1 -i ../fix-build.patch
+
   # Port to GStreamer 1.0
   patch -Np1 -i ../gstreamer-1.0.patch
 

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2016-07-12 19:44:09 UTC (rev 182707)
@@ -0,0 +1,25 @@
+From 46c37c04967c06d1f8ded3b40161b9d9fcb8ff8d Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Fri, 19 Jun 2015 09:14:14 +0200
+Subject: libgnac-debug.h: fix typo (critial vs critical)
+
+---
+ libgnac/libgnac-debug.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnac/libgnac-debug.h b/libgnac/libgnac-debug.h
+index 3f2705d..087e251 100644
+--- a/libgnac/libgnac-debug.h
++++ b/libgnac/libgnac-debug.h
+@@ -52,7 +52,7 @@
+ 
+ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define libgnac_critical(...) \
+-        libgnac_critial_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
++        libgnac_critical_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__)
+ #elif defined(__GNUC__) && __GNUC__ >= 3
+ #define libgnac_critical(...) \
+         libgnac_critical_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+-- 
+cgit v0.12
+

Deleted: gnac.install
===================================================================
--- gnac.install	2016-07-12 19:30:25 UTC (rev 182706)
+++ gnac.install	2016-07-12 19:44:09 UTC (rev 182707)
@@ -1,18 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-
-  if [ "$(vercmp 0.2.4.1-3 "$2")" -eq 1 ]; then
-    printf '==> Users have to fix/delete their profiles in ~/.local/share/gnac/profiles\n'
-    printf '    after upgrade to make them compatible with GStreamer 1.0.\n'
-  fi
-}
-
-post_remove() {
-  post_install $1
-}