Thu Aug 22 02:58:39 PDT 2013

3 files changed, 28 insertions, 47 deletions

diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD
index 3b824b5f4..212caebf4 100755
--- a/community/higan-qt/PKGBUILD
+++ b/community/higan-qt/PKGBUILD
@@ -1,87 +1,84 @@
-# $Id: PKGBUILD 95928 2013-08-18 22:47:02Z alucryd $
+# $Id: PKGBUILD 96212 2013-08-21 19:22:00Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=higan-qt
 pkgver=093
-pkgrel=1
+pkgrel=2
 pkgdesc="Nintendo multi-system emulator - Qt version"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/higan/"
 license=('GPL3')
 depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog')
-makedepends=('mesa')
+makedepends=('gendesk' 'mesa')
 optdepends=('beat: Delta patcher')
 conflicts=('higan-gtk')
 source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz"
         "http://higan.googlecode.com/files/purify_v03-source.tar.xz"
-        'higan'
-        'higan.desktop'
-        'purify.desktop')
+        'higan')
 sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538'
             '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38'
-            'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048'
-            'e9daf06d65fc95e3bfca4e9b9953dcc16830014ba895053c5553d5972031ffbc'
-            '5f24cc7884d19721b6f9ad14c14a98347de209a2791f4c830be83bd032f693f8')
+            'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
 
 _profiles="accuracy balanced performance"
 
 prepare() {
+  gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u'
+  gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify'
+
   cd "${srcdir}"/higan_v${pkgver}-source
 
-# Qt 4.8 fix
   moc-qt4 -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp
-
-# Use $CXXFLAGS
   sed -i "s/flags   += -I. -O3 -fomit-frame-pointer/flags   += -I. -fomit-frame-pointer -std=gnu++11/
           s/flags += -march=native/flags += $CXXFLAGS/g" Makefile
 
   cd "${srcdir}"/purify_v03-source
 
-# Qt 4.8 fix
   moc-qt4 -i -Ipurify/phoenix/qt/ -o purify/phoenix/qt/platform.moc purify/phoenix/qt/platform.moc.hpp
 }
 
 build() {
-# Compile libananke
-  cd "${srcdir}"/higan_v${pkgver}-source/ananke
-  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11"
-
-# Compile higan
   cd "${srcdir}"/higan_v${pkgver}-source
+
+# libananke
+  make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke
+
+# higan
   for _profile in ${_profiles}; do
     make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile}
-    mv out/higan out/higan-${_profile}
+    mv out/higan{,-${_profile}}
     make clean
   done
 
-# Compile purify
+# purify
   cd "${srcdir}"/purify_v03-source/purify
   make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic'
 }
 
 package() {
-# Install common files
   cd "${srcdir}"/higan_v${pkgver}-source
+
+# Common files
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}}
-  install -m 755 ../higan "${pkgdir}"/usr/bin/higan
-  install -m 644 ../higan.desktop "${pkgdir}"/usr/share/applications/higan.desktop
+  install -m 755 {..,"${pkgdir}"/usr/bin}/higan
+  install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop
   install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png
   cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/
   cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/
 
-# Install libananke
+# libananke
   install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1
-  ln -s /usr/lib/libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
+  ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so
 
-# Install higan
-  for _profile in ${_profiles} ; do
-    install -m 755 out/higan-${_profile} "${pkgdir}"/usr/bin/higan-${_profile}
+# higan
+  for _profile in ${_profiles}; do
+    install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile}
   done
 
-# Install purify
+# purify
   cd "${srcdir}"/purify_v03-source/purify
-  install -m 755 purify "${pkgdir}"/usr/bin/purify
-  install -m 644 "${srcdir}"/purify.desktop "${pkgdir}"/usr/share/applications/purify.desktop
+  install -m 755 {,"${pkgdir}"/usr/bin/}purify
+  install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop
+  ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png
 
 # Fix permissions
   find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} +
diff --git a/community/higan-qt/higan.desktop b/community/higan-qt/higan.desktop
deleted file mode 100755
index c9cd3c14b..000000000
--- a/community/higan-qt/higan.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=higan
-Comment=Nintendo multi-system emulator
-Exec=higan %u
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/community/higan-qt/purify.desktop b/community/higan-qt/purify.desktop
deleted file mode 100755
index 354dc2849..000000000
--- a/community/higan-qt/purify.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=purify
-Comment=ROM purifier
-Exec=/usr/bin/purify
-Icon=higan
-Terminal=false
-Type=Application
-Categories=Game;Emulator;