[indicator-appmenu] Update to version 12.10.3 with Ubuntu release 0ub…

…untu3

indicator-appmenu/PKGBUILD

@@ -4,7 +4,8 @@
 
 pkgbase=indicator-appmenu
 pkgname=('indicator-appmenu' 'indicator-appmenu-tools')
-pkgver=12.10.3
+_ubuntu_rel=0ubuntu3
+pkgver=12.10.3.${_ubuntu_rel}
 pkgrel=100
 pkgdesc="An indicator to host the menus from an application"
 arch=('i686' 'x86_64')
@@ -16,11 +17,19 @@ optdepends=('appmenu-gtk2: support for GTK+ 2 apps'
             'appmenu-gtk3: support for GTK+ 3 apps'
             'appmenu-qt: support for Qt apps')
 options=('!libtool' '!emptydirs')
-source=("http://launchpad.net/${pkgbase}/12.10/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz")
-sha512sums=('0055c46d630f2988ff781f8224d3eb10822ebb4bf8f3ece8a808a4631a3c278580ccd19dd4d92b8438d176be6d84af30e0805b28c9507cdde1f2fbb45a579dfe')
+source=("http://launchpad.net/${pkgbase}/12.10/${pkgver%.*}/+download/${pkgbase}-${pkgver%.*}.tar.gz"
+        "https://launchpad.net/ubuntu/+archive/primary/+files/indicator-appmenu_${pkgver%.*}-${_ubuntu_rel}.diff.gz")
+sha512sums=('0055c46d630f2988ff781f8224d3eb10822ebb4bf8f3ece8a808a4631a3c278580ccd19dd4d92b8438d176be6d84af30e0805b28c9507cdde1f2fbb45a579dfe'
+            '5322ac57e73499e998a2005308167f05489d5ce6bcfaa63ad3102cb1b53fcec76f7f4e62990d6370662f797210f7da47a9226e4efd20295e7b03b8900a0194af')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver%.*}"
+
+  # Apply Ubuntu's patches
+  patch -p1 -i "${srcdir}/indicator-appmenu_${pkgver%.*}-${_ubuntu_rel}.diff"
+  for i in $(grep -v '#' debian/patches/series); do
+    patch -p1 -i "debian/patches/${i}"
+  done
 
   autoreconf -vfi
   intltoolize -f
@@ -40,7 +49,7 @@ package_indicator-appmenu() {
   depends=('dconf' 'libindicator3' 'libdbusmenu-gtk3' 'libbamf3')
   install="${pkgbase}.install"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/"
+  cd "${srcdir}/${pkgbase}-${pkgver%.*}/"
 
   make -C data DESTDIR="${pkgdir}/" install
   make -C src DESTDIR="${pkgdir}/" install
@@ -54,7 +63,7 @@ package_indicator-appmenu-tools() {
   depends=('indicator-appmenu')
 
   # Doesn't matter which one is used
-  cd "${srcdir}/${pkgbase}-${pkgver}/"
+  cd "${srcdir}/${pkgbase}-${pkgver%.*}/"
 
   make -C docs DESTDIR="${pkgdir}/" install
   make -C tools DESTDIR="${pkgdir}/" install

indicator-appmenu/compare_versions.sh

@@ -3,13 +3,13 @@
 source "$(dirname ${0})/PKGBUILD"
 
 echo "Getting latest Ubuntu version..."
-UBUNTU_VER=($(wget -q -O - 'https://launchpad.net/ubuntu/quantal/+source/indicator-appmenu' | sed -n 's/^.*current\ release\ (\(.*\)-\(.*\)).*$/\1 \2/p'))
+UBUNTU_VER=($(wget -q -O - 'https://launchpad.net/ubuntu/raring/+source/indicator-appmenu' | sed -n 's/^.*current\ release\ (\(.*\)-\(.*\)).*$/\1 \2/p'))
 
 echo "Getting latest upstream version..."
 UPSTREAM_VER=$(wget -q 'https://launchpad.net/indicator-appmenu/+download' -O - | sed -n 's/.*indicator-appmenu-\(.*\)\.tar\.gz.*/\1/p' | head -n 1)
 
 echo ""
 
-echo -e "PKGBUILD version: ${pkgver}"
+echo -e "PKGBUILD version: ${pkgver%.*} ${_ubuntu_rel}"
 echo -e "Upstream version: ${UPSTREAM_VER}"
 echo -e "Ubuntu version:   ${UBUNTU_VER[@]}"