Date: Thursday, April 18, 2013 @ 04:16:47
Author: eric
Revision: 183160
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
neverball/repos/extra-i686/PKGBUILD
(from rev 183159, neverball/trunk/PKGBUILD)
neverball/repos/extra-i686/neverball-1.5.4-underlink.patch
(from rev 183159, neverball/trunk/neverball-1.5.4-underlink.patch)
neverball/repos/extra-i686/neverball.install
(from rev 183159, neverball/trunk/neverball.install)
neverball/repos/extra-x86_64/PKGBUILD
(from rev 183159, neverball/trunk/PKGBUILD)
neverball/repos/extra-x86_64/neverball-1.5.4-underlink.patch
(from rev 183159, neverball/trunk/neverball-1.5.4-underlink.patch)
neverball/repos/extra-x86_64/neverball.install
(from rev 183159, neverball/trunk/neverball.install)
Deleted:
neverball/repos/extra-i686/PKGBUILD
neverball/repos/extra-i686/neverball-1.5.4-underlink.patch
neverball/repos/extra-x86_64/PKGBUILD
neverball/repos/extra-x86_64/neverball-1.5.4-underlink.patch
----------------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++
/neverball-1.5.4-underlink.patch | 44 +++++++++++
extra-i686/PKGBUILD | 47 -----------
extra-i686/neverball-1.5.4-underlink.patch | 22 -----
extra-i686/neverball.install | 11 ++
extra-x86_64/PKGBUILD | 47 -----------
extra-x86_64/neverball-1.5.4-underlink.patch | 22 -----
extra-x86_64/neverball.install | 11 ++
8 files changed, 166 insertions(+), 138 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-04-18 02:16:02 UTC (rev 183159)
+++ extra-i686/PKGBUILD 2013-04-18 02:16:47 UTC (rev 183160)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <e...@archlinux.org>
-
-pkgname=neverball
-pkgver=1.5.4
-pkgrel=4
-pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
-arch=('i686' 'x86_64')
-url="http://neverball.org/";
-license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
-makedepends=('mesa')
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz
neverball-1.5.4-underlink.patch)
-sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
- 'f71982b7187d569c57b30c4c40fedd6c0e72baca')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE
"/usr/share/locale"|' share/base_config.h
- patch -p0 -i ../neverball-1.5.4-underlink.patch
-
- if [ "${CARCH}" = "i686" ] ;then
- make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
- else
- make ENABLE_NLS=1 DATADIR=/usr/share/neverball
- fi
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -d "${pkgdir}/usr/bin"
- install -d
"${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
- install -d "${pkgdir}"/usr/share/man/man{1,6}
-
- install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
- cp -r locale/* "${pkgdir}/usr/share/locale/"
- cp -r data/* "${pkgdir}/usr/share/neverball/"
- install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
- install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
- install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
- install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
- install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
-
- ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
- ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
- find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-}
Copied: neverball/repos/extra-i686/PKGBUILD (from rev 183159,
neverball/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-04-18 02:16:47 UTC (rev 183160)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=neverball
+pkgver=1.5.4
+pkgrel=5
+pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
+arch=('i686' 'x86_64')
+url="http://neverball.org/";
+license=('GPL')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \
+ 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('mesa')
+install=neverball.install
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz
neverball-1.5.4-underlink.patch)
+sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
+ 'f71982b7187d569c57b30c4c40fedd6c0e72baca')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i ../neverball-1.5.4-underlink.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \
+ CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS"
+}
+
+package(){
+ cd ${pkgname}-${pkgver}
+ install -d "${pkgdir}/usr/bin"
+ install -d
"${pkgdir}"/usr/share/{neverball,locale,applications,doc/neverball}
+ install -d "${pkgdir}"/usr/share/man/man{1,6}
+
+ install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
+ cp -r locale/* "${pkgdir}/usr/share/locale/"
+ cp -r data/* "${pkgdir}/usr/share/neverball/"
+ install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
+ install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
+ install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
+ install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
+
+ for i in 16 24 32 48 64 128 256; do
+ install -D -m644 dist/neverball_$i.png
"${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png"
+ install -D -m644 dist/neverputt_$i.png
"${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png"
+ done
+
+ chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
+}
Deleted: extra-i686/neverball-1.5.4-underlink.patch
===================================================================
--- extra-i686/neverball-1.5.4-underlink.patch 2013-04-18 02:16:02 UTC (rev
183159)
+++ extra-i686/neverball-1.5.4-underlink.patch 2013-04-18 02:16:47 UTC (rev
183160)
@@ -1,22 +0,0 @@
---- Makefile.old 2011-06-22 06:30:52.441788160 +0200
-+++ Makefile 2011-06-22 06:31:59.754087534 +0200
-@@ -138,7 +138,7 @@
- endif
-
- ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
-- -lvorbisfile $(OGL_LIBS)
-+ -lvorbisfile $(OGL_LIBS) -lX11
-
-
#------------------------------------------------------------------------------
-
---- Makefile.old 2012-01-18 21:28:23.000000000 -0500
-+++ Makefile 2012-01-18 21:28:55.000000000 -0500
-@@ -131,7 +131,7 @@
- OGL_LIBS := -framework OpenGL
- endif
-
--BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
-
- ifdef DARWIN
- BASE_LIBS += -L/opt/local/lib
Copied: neverball/repos/extra-i686/neverball-1.5.4-underlink.patch (from rev
183159, neverball/trunk/neverball-1.5.4-underlink.patch)
===================================================================
--- extra-i686/neverball-1.5.4-underlink.patch (rev 0)
+++ extra-i686/neverball-1.5.4-underlink.patch 2013-04-18 02:16:47 UTC (rev
183160)
@@ -0,0 +1,22 @@
+--- Makefile.old 2011-06-22 06:30:52.441788160 +0200
++++ Makefile 2011-06-22 06:31:59.754087534 +0200
+@@ -138,7 +138,7 @@
+ endif
+
+ ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
+- -lvorbisfile $(OGL_LIBS)
++ -lvorbisfile $(OGL_LIBS) -lX11
+
+
#------------------------------------------------------------------------------
+
+--- Makefile.old 2012-01-18 21:28:23.000000000 -0500
++++ Makefile 2012-01-18 21:28:55.000000000 -0500
+@@ -131,7 +131,7 @@
+ OGL_LIBS := -framework OpenGL
+ endif
+
+-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
++BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
+
+ ifdef DARWIN
+ BASE_LIBS += -L/opt/local/lib
Copied: neverball/repos/extra-i686/neverball.install (from rev 183159,
neverball/trunk/neverball.install)
===================================================================
--- extra-i686/neverball.install (rev 0)
+++ extra-i686/neverball.install 2013-04-18 02:16:47 UTC (rev 183160)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-04-18 02:16:02 UTC (rev 183159)
+++ extra-x86_64/PKGBUILD 2013-04-18 02:16:47 UTC (rev 183160)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <e...@archlinux.org>
-
-pkgname=neverball
-pkgver=1.5.4
-pkgrel=4
-pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
-arch=('i686' 'x86_64')
-url="http://neverball.org/";
-license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
-makedepends=('mesa')
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz
neverball-1.5.4-underlink.patch)
-sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
- 'f71982b7187d569c57b30c4c40fedd6c0e72baca')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE
"/usr/share/locale"|' share/base_config.h
- patch -p0 -i ../neverball-1.5.4-underlink.patch
-
- if [ "${CARCH}" = "i686" ] ;then
- make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
- else
- make ENABLE_NLS=1 DATADIR=/usr/share/neverball
- fi
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -d "${pkgdir}/usr/bin"
- install -d
"${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
- install -d "${pkgdir}"/usr/share/man/man{1,6}
-
- install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
- cp -r locale/* "${pkgdir}/usr/share/locale/"
- cp -r data/* "${pkgdir}/usr/share/neverball/"
- install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
- install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
- install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
- install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
- install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
-
- ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
- ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
- find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-}
Copied: neverball/repos/extra-x86_64/PKGBUILD (from rev 183159,
neverball/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-04-18 02:16:47 UTC (rev 183160)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=neverball
+pkgver=1.5.4
+pkgrel=5
+pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
+arch=('i686' 'x86_64')
+url="http://neverball.org/";
+license=('GPL')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \
+ 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('mesa')
+install=neverball.install
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz
neverball-1.5.4-underlink.patch)
+sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
+ 'f71982b7187d569c57b30c4c40fedd6c0e72baca')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0 -i ../neverball-1.5.4-underlink.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \
+ CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS"
+}
+
+package(){
+ cd ${pkgname}-${pkgver}
+ install -d "${pkgdir}/usr/bin"
+ install -d
"${pkgdir}"/usr/share/{neverball,locale,applications,doc/neverball}
+ install -d "${pkgdir}"/usr/share/man/man{1,6}
+
+ install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
+ cp -r locale/* "${pkgdir}/usr/share/locale/"
+ cp -r data/* "${pkgdir}/usr/share/neverball/"
+ install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
+ install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
+ install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
+ install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
+
+ for i in 16 24 32 48 64 128 256; do
+ install -D -m644 dist/neverball_$i.png
"${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png"
+ install -D -m644 dist/neverputt_$i.png
"${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png"
+ done
+
+ chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
+}
Deleted: extra-x86_64/neverball-1.5.4-underlink.patch
===================================================================
--- extra-x86_64/neverball-1.5.4-underlink.patch 2013-04-18 02:16:02 UTC
(rev 183159)
+++ extra-x86_64/neverball-1.5.4-underlink.patch 2013-04-18 02:16:47 UTC
(rev 183160)
@@ -1,22 +0,0 @@
---- Makefile.old 2011-06-22 06:30:52.441788160 +0200
-+++ Makefile 2011-06-22 06:31:59.754087534 +0200
-@@ -138,7 +138,7 @@
- endif
-
- ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
-- -lvorbisfile $(OGL_LIBS)
-+ -lvorbisfile $(OGL_LIBS) -lX11
-
-
#------------------------------------------------------------------------------
-
---- Makefile.old 2012-01-18 21:28:23.000000000 -0500
-+++ Makefile 2012-01-18 21:28:55.000000000 -0500
-@@ -131,7 +131,7 @@
- OGL_LIBS := -framework OpenGL
- endif
-
--BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
-+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
-
- ifdef DARWIN
- BASE_LIBS += -L/opt/local/lib
Copied: neverball/repos/extra-x86_64/neverball-1.5.4-underlink.patch (from rev
183159, neverball/trunk/neverball-1.5.4-underlink.patch)
===================================================================
--- extra-x86_64/neverball-1.5.4-underlink.patch
(rev 0)
+++ extra-x86_64/neverball-1.5.4-underlink.patch 2013-04-18 02:16:47 UTC
(rev 183160)
@@ -0,0 +1,22 @@
+--- Makefile.old 2011-06-22 06:30:52.441788160 +0200
++++ Makefile 2011-06-22 06:31:59.754087534 +0200
+@@ -138,7 +138,7 @@
+ endif
+
+ ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
+- -lvorbisfile $(OGL_LIBS)
++ -lvorbisfile $(OGL_LIBS) -lX11
+
+
#------------------------------------------------------------------------------
+
+--- Makefile.old 2012-01-18 21:28:23.000000000 -0500
++++ Makefile 2012-01-18 21:28:55.000000000 -0500
+@@ -131,7 +131,7 @@
+ OGL_LIBS := -framework OpenGL
+ endif
+
+-BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
++BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm
+
+ ifdef DARWIN
+ BASE_LIBS += -L/opt/local/lib
Copied: neverball/repos/extra-x86_64/neverball.install (from rev 183159,
neverball/trunk/neverball.install)
===================================================================
--- extra-x86_64/neverball.install (rev 0)
+++ extra-x86_64/neverball.install 2013-04-18 02:16:47 UTC (rev 183160)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
