[arch-commits] Commit in apricots/trunk (4 files)

Jan Steffens heftig at archlinux.org
Sat Sep 21 11:34:26 UTC 2019


    Date: Saturday, September 21, 2019 @ 11:34:26
  Author: heftig
Revision: 363192

0.2.6-9

Added:
  apricots/trunk/apricots.desktop
  apricots/trunk/apricots.png
Modified:
  apricots/trunk/PKGBUILD
  apricots/trunk/apricots-0.2.6-freealut.patch

-------------------------------+
 PKGBUILD                      |   37 ++++++++++++++++++++++++++-----------
 apricots-0.2.6-freealut.patch |   33 ++++++++++++++++++++++-----------
 apricots.desktop              |   10 ++++++++++
 apricots.png                  |    1 +
 4 files changed, 59 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-21 08:21:22 UTC (rev 363191)
+++ PKGBUILD	2019-09-21 11:34:26 UTC (rev 363192)
@@ -2,26 +2,41 @@
 
 pkgname=apricots
 pkgver=0.2.6
-pkgrel=8
+pkgrel=9
 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers"
-arch=("x86_64")
-license=('GPL')
 url="http://www.fishies.org.uk/apricots.html"
-depends=('gcc-libs' 'openal' 'sdl' 'freealut')
+arch=(x86_64)
+license=(GPL)
+depends=(gcc-libs sdl freealut hicolor-icon-theme)
 #source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz"
+backup=(etc/apricots.cfg)
 source=("https://sources.archlinux.org/other/apricots/$pkgname-$pkgver.tar.gz"
-        "apricots-0.2.6-freealut.patch")
+        apricots.desktop apricots.png
+        apricots-0.2.6-freealut.patch)
 sha512sums=('cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5'
-            '1a3efc32776ab364ca242611ec8a5ee6018b470a122430e22b222934361ceafd09e3fbc2c60e273990263c599f08d097887babde10500a78269356611fde75ad')
+            '9f2255f440fef17dccb38474edc5bef9f9770d026bbbc074e0a4dbd4bcc6fb639e00e7c6f370c67f478d6bc0d869f3c40bcfc0b493a08bff531fd754b7282d75'
+            '77061be211c4f03e21af3b6c0f43d1be6b1d2b323415d7e0c03daf1b29d6010ac69b1f7e27057ff399f91987f6b10b8e78f66d669cb81f396ae2cfc209b41983'
+            '002cc098dc0239c2fb771560d0957b93242d03055ade9a02e015e8a1e867ef06feb66499e3a39d1fea5261ede98b7193e256a0fc2cccb785df4e709cd3ca6efc')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../apricots-0.2.6-freealut.patch
+  autoreconf -fvi
+}
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
-  make LIBTOOL='/usr/bin/libtool'
+  make LIBTOOL=/usr/bin/libtool
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
+  make -C $pkgname-$pkgver install prefix="$pkgdir/usr" LIBTOOL=/usr/bin/libtool
+
+  mkdir "$pkgdir/etc"
+  mv "$pkgdir/usr/share/apricots/apricots.cfg" "$pkgdir/etc"
+  ln -sr "$pkgdir/etc/apricots.cfg" "$pkgdir/usr/share/apricots"
+
+  install -Dt "$pkgdir/usr/share/applications" -m644 apricots.desktop
+  install -Dt "$pkgdir/usr/share/icons/hicolor/24x24/apps" -m644 apricots.png
 }

Modified: apricots-0.2.6-freealut.patch
===================================================================
--- apricots-0.2.6-freealut.patch	2019-09-21 08:21:22 UTC (rev 363191)
+++ apricots-0.2.6-freealut.patch	2019-09-21 11:34:26 UTC (rev 363192)
@@ -1,5 +1,6 @@
---- apricots/apricots.cpp
-+++ apricots/apricots.cpp
+diff -u -r apricots-0.2.6/apricots/apricots.cpp apricots-0.2.6-freealut/apricots/apricots.cpp
+--- apricots-0.2.6/apricots/apricots.cpp	2003-08-05 22:01:16.000000000 +0000
++++ apricots-0.2.6-freealut/apricots/apricots.cpp	2019-09-21 11:16:31.723765376 +0000
 @@ -16,6 +16,7 @@
  int main(int, char**){
  #endif
@@ -8,10 +9,20 @@
    // Initialize data
    gamedata g;
    init_data(g);
-
---- apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
+diff -u -r apricots-0.2.6/apricots/sampleio.cpp apricots-0.2.6-freealut/apricots/sampleio.cpp
+--- apricots-0.2.6/apricots/sampleio.cpp	2003-08-05 23:21:22.000000000 +0000
++++ apricots-0.2.6-freealut/apricots/sampleio.cpp	2019-09-21 11:17:03.164207665 +0000
+@@ -13,6 +13,9 @@
+ //   Code cleanup
+ 
+ #include "sampleio.h"
++#include <AL/al.h>
++#include <AL/alc.h>
++#include <AL/alut.h>
+ 
+ // Empty Noaudio sound routines
+ #if AP_AUDIO==AUDIO_NOAUDIO
+@@ -74,12 +77,9 @@
    alListenerfv(AL_ORIENTATION, front );
  
    // Load in samples
@@ -24,7 +35,7 @@
      // Evil OpenAL portability fix done here
  #ifdef _WIN32
      ALenum format;
-@@ -87,15 +84,12 @@
+@@ -87,15 +87,12 @@
      alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
      fileok = (alGetError() == AL_NO_ERROR);
  #else
@@ -42,7 +53,7 @@
    }
  
    // Generate Sources
-@@ -107,7 +101,6 @@
+@@ -107,7 +104,6 @@
      alSourcefv(sources[j], AL_ORIENTATION, back );
    }
    
@@ -50,9 +61,9 @@
    
  }
  
-
---- configure.in
-+++ configure.in
+diff -u -r apricots-0.2.6/configure.in apricots-0.2.6-freealut/configure.in
+--- apricots-0.2.6/configure.in	2003-08-13 01:11:25.000000000 +0000
++++ apricots-0.2.6-freealut/configure.in	2019-09-21 11:16:31.723765376 +0000
 @@ -100,7 +100,8 @@
  
  dnl Check for OpenAL

Added: apricots.desktop
===================================================================
--- apricots.desktop	                        (rev 0)
+++ apricots.desktop	2019-09-21 11:34:26 UTC (rev 363192)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Apricots
+GenericName=Apricots
+Comment=2D air combat game
+Exec=apricots
+Icon=apricots
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Game;ArcadeGame;

Added: apricots.png
===================================================================
(Binary files differ)

Index: apricots/trunk/apricots.png
===================================================================
--- apricots.png	2019-09-21 08:21:22 UTC (rev 363191)
+++ apricots.png	2019-09-21 11:34:26 UTC (rev 363192)

Property changes on: apricots/trunk/apricots.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property


More information about the arch-commits mailing list