[arch-commits] Commit in icon-naming-utils/trunk (PKGBUILD remove-legacy-calc.patch)

[Ionut Biru]

    Date: Monday, June 6, 2011 @ 08:30:53
  Author: ibiru
Revision: 126586

remove legacy calc icon, it conflicts with libreoffice.FS#24570

Added:
  icon-naming-utils/trunk/remove-legacy-calc.patch
Modified:
  icon-naming-utils/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   22 ++++++++++++++--------
 remove-legacy-calc.patch |   15 +++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-06 10:50:07 UTC (rev 126585)
+++ PKGBUILD	2011-06-06 12:30:53 UTC (rev 126586)
@@ -4,21 +4,27 @@
 
 pkgname=icon-naming-utils
 pkgver=0.8.90
-pkgrel=1
+pkgrel=2
 pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
-arch=(i686 x86_64)
+arch=(any)
 license=('GPL')
 url="http://tango.freedesktop.org/"
 depends=('perl-xml-simple')
-source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dd8108b56130b9eedc4042df634efa66')
+source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2
+        remove-legacy-calc.patch)
+md5sums=('dd8108b56130b9eedc4042df634efa66'
+         'd3490e31df95ae11c96f0af2a9ef2ed0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/remove-legacy-calc.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/icon-naming-utils \
-	      --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig" || return 1
+	      --localstatedir=/var
+  make
 }
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig"
+}

Added: remove-legacy-calc.patch
===================================================================
--- remove-legacy-calc.patch	                        (rev 0)
+++ remove-legacy-calc.patch	2011-06-06 12:30:53 UTC (rev 126586)
@@ -0,0 +1,15 @@
+diff -Nur icon-naming-utils-0.8.90.orig/legacy-icon-mapping.xml icon-naming-utils-0.8.90/legacy-icon-mapping.xml
+--- icon-naming-utils-0.8.90.orig/legacy-icon-mapping.xml	2011-06-06 12:18:27.059555925 +0000
++++ icon-naming-utils-0.8.90/legacy-icon-mapping.xml	2011-06-06 12:18:47.709737921 +0000
+@@ -427,11 +427,6 @@
+ 	</icon>
+     </context>
+     <context dir="apps">
+-	<icon name="accessories-calculator">
+-	    <link>gnome-calculator</link>
+-	    <link>kcalc</link>
+-	    <link>calc</link>
+-	</icon>
+ 	<icon name="accessories-character-map">
+ 	    <link>gnome-character-map</link>
+ 	    <link>gucharmap</link>