[arch-commits] Commit in q4wine/repos/community-i686 (4 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Sun May 5 21:33:38 UTC 2013


    Date: Sunday, May 5, 2013 @ 23:33:37
  Author: spupykin
Revision: 89940

archrelease: copy trunk to community-i686

Added:
  q4wine/repos/community-i686/PKGBUILD
    (from rev 89939, q4wine/trunk/PKGBUILD)
  q4wine/repos/community-i686/q4wine.desktop
    (from rev 89939, q4wine/trunk/q4wine.desktop)
Deleted:
  q4wine/repos/community-i686/PKGBUILD
  q4wine/repos/community-i686/q4wine.desktop

----------------+
 PKGBUILD       |   73 +++++++++++++++++++++++++++++++------------------------
 q4wine.desktop |   36 +++++++++++++--------------
 2 files changed, 60 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-05 21:33:27 UTC (rev 89939)
+++ PKGBUILD	2013-05-05 21:33:37 UTC (rev 89940)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
-
-pkgname=q4wine
-pkgver=1.0_r2
-pkgrel=1
-pkgdesc="A Qt4 GUI for Wine"
-arch=("i686" "x86_64")
-url="http://sourceforge.net/projects/${pkgname}/"
-license=("GPL3")
-depends=("qt4" "wine" "sqlite3" "which" "icoutils")
-makedepends=("cmake")
-optdepends=("winetricks" "fuseiso")
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2)
-md5sums=('0f559a169cfa96d76f36ea177004d64e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_WINETRIKS=ON \
-    -DLIBS_ENTRY_PATH=/usr/lib/$pkgname .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  make DESTDIR=${pkgdir} install
-}

Copied: q4wine/repos/community-i686/PKGBUILD (from rev 89939, q4wine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-05 21:33:37 UTC (rev 89940)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
+
+pkgname=q4wine
+pkgver=1.0_r3
+pkgrel=1
+pkgdesc="A Qt4 GUI for Wine"
+arch=("i686" "x86_64")
+url="http://sourceforge.net/projects/${pkgname}/"
+license=("GPL3")
+if [[ $CARCH == x86_64 ]]; then
+  # in multilib repo catalyst is 1st and default, so hardcode lib32-mesa-libgl
+  depends=("lib32-mesa-libgl" "qt4" "wine" "sqlite3" "which" "icoutils")
+  makedepends=("cmake")
+else
+  depends=("qt4" "wine" "sqlite3" "which" "icoutils")
+  makedepends=("cmake")
+fi
+optdepends=("winetricks" "fuseiso")
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2)
+md5sums=('29bb4b51334a78191611f49c050950d1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_WINETRIKS=ON \
+    -DLIBS_ENTRY_PATH=/usr/lib/$pkgname .
+  make
+}
+
+package() {
+if [[ $CARCH == x86_64 ]]; then
+  # remove hardcoded lib32-mesa-libgl
+  depends=(${depends[@]:1})
+fi
+
+  cd ${srcdir}/${pkgname}-${pkgver/_/-}
+  make DESTDIR=${pkgdir} install
+}

Deleted: q4wine.desktop
===================================================================
--- q4wine.desktop	2013-05-05 21:33:27 UTC (rev 89939)
+++ q4wine.desktop	2013-05-05 21:33:37 UTC (rev 89940)
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Q4Wine
-GenericName=A Qt4 GUI for Wine
-Comment=A Qt4 GUI for Wine
-#Version=0.1
-Type=Application
-Categories=KDE;Qt;Settings
-Terminal=false
-Encoding=UTF-8
-Icon=wine
-Exec=q4wine
-#ServiceTypes=inode/directory
-#Actions=Create;
-#X-KDE-Submenu=
-#X-KDE-Priority=TopLevel
-#X-KDE-Icon=tgz
-X-KDE-StartupNotify=true
-#X-DCOP-ServiceType=Unique

Copied: q4wine/repos/community-i686/q4wine.desktop (from rev 89939, q4wine/trunk/q4wine.desktop)
===================================================================
--- q4wine.desktop	                        (rev 0)
+++ q4wine.desktop	2013-05-05 21:33:37 UTC (rev 89940)
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Q4Wine
+GenericName=A Qt4 GUI for Wine
+Comment=A Qt4 GUI for Wine
+#Version=0.1
+Type=Application
+Categories=KDE;Qt;Settings
+Terminal=false
+Encoding=UTF-8
+Icon=wine
+Exec=q4wine
+#ServiceTypes=inode/directory
+#Actions=Create;
+#X-KDE-Submenu=
+#X-KDE-Priority=TopLevel
+#X-KDE-Icon=tgz
+X-KDE-StartupNotify=true
+#X-DCOP-ServiceType=Unique




More information about the arch-commits mailing list