[arch-commits] Commit in mate-panel/trunk (PKGBUILD update_wm_name.diff)

[Martin Wimpress]

    Date: Thursday, May 7, 2015 @ 12:40:41
  Author: flexiondotorg
Revision: 132861

Update to 1.10

Modified:
  mate-panel/trunk/PKGBUILD
Deleted:
  mate-panel/trunk/update_wm_name.diff

---------------------+
 PKGBUILD            |   41 ++++++++++++++++++-----------------------
 update_wm_name.diff |   13 -------------
 2 files changed, 18 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-07 10:32:10 UTC (rev 132860)
+++ PKGBUILD	2015-05-07 10:40:41 UTC (rev 132861)
@@ -1,35 +1,30 @@
 # Maintainer : Martin Wimpress <code at flexion.org>
 
-pkgname=mate-panel
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="The MATE Panel"
+_ver=1.10
+pkgbase=mate-panel
+pkgname=(${pkgbase})
+pkgver=${_ver}.0
+pkgrel=1
+pkgdesc="The MATE Panel (GTK2 version)"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('caja' 'dbus-glib' 'dconf' 'gtk2' 'libwnck' 'libcanberra' 'libice'
-         'libmateweather' 'librsvg' 'libsm' 'libsoup' 'libxau' 'marco'
-         'mate-menus' 'mate-desktop' 'mate-session-manager')
-makedepends=('gobject-introspection' 'mate-common' 'networkmanager'
-             'perl-xml-parser' 'yelp-tools')
+depends=('caja>=1.10' 'dbus-glib' 'dconf' 'gtk2' 'libwnck' 'libcanberra' 'libice'
+         'libmateweather>=1.9.1' 'librsvg' 'libsm' 'libsoup' 'libxau' 'marco>=1.10'
+         'mate-menus>=1.10' 'mate-desktop>=1.10' 'mate-session-manager>=1.10')
+makedepends=('gobject-introspection' 'mate-common' 'yelp-tools')
 optdepends=('yelp: for reading MATE help documents')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${pkgbase}-${pkgver}.tar.xz")
 groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
-        "update_wm_name.diff")
-sha1sums=('18795801763059269573015f33f16651a1fd36bc'
-          '45c1228e51dbcec7c9e17e665115e81c81b89e32')
-install=${pkgname}.install
+conflicts=("${pkgbase}-gtk3")
+sha1sums=('632d7127fba8c5fa76f5dd951db89325c6ca3f89')
+install=${pkgbase}.install
 
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -Np1 -i "${srcdir}/update_wm_name.diff"
-}
-
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/${pkgname} \
+        --libexecdir=/usr/lib/${pkgbase} \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --with-gtk=2.0 \
@@ -38,7 +33,7 @@
     make
 }
 
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+package_mate-panel() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }

Deleted: update_wm_name.diff
===================================================================
--- update_wm_name.diff	2015-05-07 10:32:10 UTC (rev 132860)
+++ update_wm_name.diff	2015-05-07 10:40:41 UTC (rev 132861)
@@ -1,13 +0,0 @@
-diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
-index bf6e365..4a568bd 100644
---- a/applets/wncklet/workspace-switcher.c
-+++ b/applets/wncklet/workspace-switcher.c
-@@ -144,7 +144,7 @@ static void window_manager_changed(WnckScreen* screen, PagerData* pager)
- 
- 	if (!wm_name)
- 		pager->wm = PAGER_WM_UNKNOWN;
--	else if (strcmp(wm_name, "Marco") == 0)
-+	else if (strcmp(wm_name, "Metacity (Marco)") == 0)
- 		pager->wm = PAGER_WM_MARCO;
- 	else if (strcmp(wm_name, "Compiz") == 0)
- 		pager->wm = PAGER_WM_COMPIZ;