[arch-commits] Commit in dosbox/trunk (PKGBUILD gcc46.patch)

[Jaroslav Lichtblau]

    Date: Sunday, September 2, 2018 @ 16:36:21
  Author: jlichtblau
Revision: 376055

upgpkg: dosbox 0.74.2-1 - new upstream release

Modified:
  dosbox/trunk/PKGBUILD
Deleted:
  dosbox/trunk/gcc46.patch

-------------+
 PKGBUILD    |   47 ++++++++++++++++++++++-------------------------
 gcc46.patch |   12 ------------
 2 files changed, 22 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-02 16:23:45 UTC (rev 376054)
+++ PKGBUILD	2018-09-02 16:36:21 UTC (rev 376055)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
 # Contributor: Jelle van der Waa <jelle at vdwaa.nl>
 # Contributor: James Rayner <james at archlinux.org>
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=dosbox
-pkgver=0.74
-pkgrel=8
+pkgver=0.74.2
+pkgrel=1
 pkgdesc='Emulator with builtin DOS for running DOS Games'
 arch=('x86_64')
 url='http://dosbox.sourceforge.net/'
@@ -13,42 +13,39 @@
 license=('GPL')
 depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu')
 makedepends=('mesa-libgl' 'gendesk')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        dosbox.png
-        gcc46.patch)
-sha512sums=('4a6ff4c658997a495119d200ec6ad37649da940814a4b14fca0dd29a99142026e324695b7aa9d2946efc2abf9067a819d911e43778efe905ed10ddf9b9f2dd3d'
-            'e6f49aadb09fc575442f292d9b318f77f087bc5e39fa8937713b79945233052d954920080678828cdec42065101735057008bf862ab3cace90f8257941aed2ce'
-            '94410caf7dbc8a6217eab19cf1df28919ff7f0b9786a20dec9205bc77d826ff0ea68ccaa38ea3319b91cc8da71cbcf3f012cd0e119655615239ee42abd64c6cb')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-0.74-2.tar.gz
+        dosbox.png)
+sha256sums=('7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf'
+            '491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b')
 
 prepare() {
-  cd "$srcdir"
+  cd "${srcdir}"
+  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 
-  gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+  cd "${srcdir}/$pkgname-0.74-2"
+  sed -i 's/png_check_sig/png_sig_cmp/' configure
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/$pkgname-0.74-2"
 
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  sed -i 's/png_check_sig/png_sig_cmp/' configure 
-
-  ./configure   --prefix=/usr --sysconfdir=/etc/dosbox  
-  make 
+  ./configure --prefix=/usr --sysconfdir=/etc/dosbox
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/$pkgname-0.74-2"
 
-  make DESTDIR="$pkgdir" install 
+  make DESTDIR="${pkgdir}" install
 
 # install docs, make does not install them
-  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
-  install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video
+  install -Dm644 README "${pkgdir}"/usr/share/doc/$pkgname/README
+  install -Dm644 docs/README.video "${pkgdir}"/usr/share/doc/$pkgname/README.video
 
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "${srcdir}/$pkgname.png" \
+    "${pkgdir}/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "${srcdir}/$pkgname.desktop" \
+    "${pkgdir}/usr/share/applications/$pkgname.desktop"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: gcc46.patch
===================================================================
--- gcc46.patch	2018-09-02 16:23:45 UTC (rev 376054)
+++ gcc46.patch	2018-09-02 16:36:21 UTC (rev 376055)
@@ -1,12 +0,0 @@
-diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
---- dosbox-0.74/include/dos_inc.h	2010-05-10 17:43:54.000000000 +0000
-+++ dosbox-0.74.new//include/dos_inc.h	2011-06-17 20:42:43.982548979 +0000
-@@ -28,6 +28,8 @@
- #include "mem.h"
- #endif
- 
-+#include <stddef.h> //for offsetof
-+
- #ifdef _MSC_VER
- #pragma pack (1)
- #endif