summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2018-02-18 16:14:44 +0100
committerJan Cholasta2018-02-18 16:18:08 +0100
commite3200a938daa5da263e2d9fc2c5eb589a7e75ca4 (patch)
tree0633a602223010c253412068d57cf63d569d8216
parent47a20ba0aa01666ac785bb3c036f3107f7f105ef (diff)
downloadaur-e3200a938daa5da263e2d9fc2c5eb589a7e75ca4.tar.gz
oblige-1:7.70-1
* fix build for the new unannounced 7.70 re-release
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--.gitattributes1
-rw-r--r--0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch46
-rw-r--r--0002-Makefile-fixed-make-install-not-installing-data-bg.patch43
-rw-r--r--PKGBUILD15
5 files changed, 3 insertions, 108 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5f9780fe083..c227ec1ddd2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,11 +11,7 @@ pkgbase = oblige
depends = fltk>=1.3.0
depends = hicolor-icon-theme
source = http://downloads.sourceforge.net/oblige/oblige-770-source.zip
- source = 0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch
- source = 0002-Makefile-fixed-make-install-not-installing-data-bg.patch
- sha256sums = 3a895c16dc352dab295ab1e3b7d62f55615bb21ff6d7d8c874787c0a62c64257
- sha256sums = 53b98896e2385822c1bdc6ab1583696a54d2b7bc88f2cfb73ca4f0c156571af8
- sha256sums = 08cd8906fbebb980976239f885c902df77ad9708361126389d470c35681dcf71
+ sha256sums = 0d35050a5a3d10c932b44cfcb9d02777012d7ab0b3e2e2ed56bc5b388c068271
pkgname = oblige
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index ec1ffa81eddd..000000000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.patch -text
diff --git a/0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch b/0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch
deleted file mode 100644
index 8b1c35592d6b..000000000000
--- a/0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 90920daf3f14711a6e3f03d284212d0122c1768b Mon Sep 17 00:00:00 2001
-From: Andrew Apted <ajapted@gmail.com>
-Date: Fri, 22 Dec 2017 12:41:03 +1100
-Subject: [PATCH] Makefile, Makefile.macos : fixed for "prefabs" directory
- removal.
-
----
- Makefile | 5 -----
- Makefile.macos | 5 -----
- 2 files changed, 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b4fe319ee..2588f2082 100644
---- a/Makefile
-+++ b/Makefile
-@@ -257,11 +257,6 @@ install: stripped
- chown -R root $(SCRIPT_DIR)/games
- chmod -R g-s $(SCRIPT_DIR)/games
- #
-- rm -Rf $(SCRIPT_DIR)/prefabs
-- cp -a prefabs $(SCRIPT_DIR)/prefabs
-- chown -R root $(SCRIPT_DIR)/prefabs
-- chmod -R g-s $(SCRIPT_DIR)/prefabs
-- #
- xdg-desktop-menu install --novendor misc/oblige.desktop
- xdg-icon-resource install --novendor --size 32 misc/oblige.xpm
-
-diff --git a/Makefile.macos b/Makefile.macos
-index 8c8647acf..e1ceee58a 100644
---- a/Makefile.macos
-+++ b/Makefile.macos
-@@ -283,11 +283,6 @@ install: stripped
- cp -a games $(SCRIPT_DIR)/games
- chown -R root $(SCRIPT_DIR)/games
- chmod -R g-s $(SCRIPT_DIR)/games
-- #
-- rm -Rf $(SCRIPT_DIR)/prefabs
-- cp -a prefabs $(SCRIPT_DIR)/prefabs
-- chown -R root $(SCRIPT_DIR)/prefabs
-- chmod -R g-s $(SCRIPT_DIR)/prefabs
-
- uninstall:
- rm -v $(PREFIX)/bin/oblige
---
-2.16.1
-
diff --git a/0002-Makefile-fixed-make-install-not-installing-data-bg.patch b/0002-Makefile-fixed-make-install-not-installing-data-bg.patch
deleted file mode 100644
index bee9e8438c0d..000000000000
--- a/0002-Makefile-fixed-make-install-not-installing-data-bg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d1baa946929673abcaa3e8ed8103a6a37baae5d9 Mon Sep 17 00:00:00 2001
-From: Andrew Apted <ajapted@gmail.com>
-Date: Tue, 9 Jan 2018 15:57:35 +1100
-Subject: [PATCH] Makefile : fixed "make install" not installing data/bg/*.*
-
----
- Makefile | 2 ++
- Makefile.macos | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 2588f2082..27a1179da 100644
---- a/Makefile
-+++ b/Makefile
-@@ -248,8 +248,10 @@ install: stripped
- install -o root -m 644 language/*.* $(SCRIPT_DIR)/language
- #
- install -d $(SCRIPT_DIR)/data
-+ install -d $(SCRIPT_DIR)/data/bg
- install -d $(SCRIPT_DIR)/data/masks
- install -o root -m 644 data/*.* $(SCRIPT_DIR)/data
-+ install -o root -m 644 data/bg/*.* $(SCRIPT_DIR)/data/bg
- install -o root -m 644 data/masks/*.* $(SCRIPT_DIR)/data/masks
- #
- rm -Rf $(SCRIPT_DIR)/games
-diff --git a/Makefile.macos b/Makefile.macos
-index e1ceee58a..d7994e451 100644
---- a/Makefile.macos
-+++ b/Makefile.macos
-@@ -275,8 +275,10 @@ install: stripped
- install -o root -m 644 language/*.* $(SCRIPT_DIR)/language
- #
- install -d $(SCRIPT_DIR)/data
-+ install -d $(SCRIPT_DIR)/data/bg
- install -d $(SCRIPT_DIR)/data/masks
- install -o root -m 644 data/*.* $(SCRIPT_DIR)/data
-+ install -o root -m 644 data/bg/*.* $(SCRIPT_DIR)/data/bg
- install -o root -m 644 data/masks/*.* $(SCRIPT_DIR)/data/masks
- #
- rm -Rf $(SCRIPT_DIR)/games
---
-2.16.1
-
diff --git a/PKGBUILD b/PKGBUILD
index b69f33b1c313..a87707398208 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,19 +10,8 @@ url='http://oblige.sourceforge.net/'
license=('GPL')
depends=('fltk>=1.3.0' 'hicolor-icon-theme')
makedepends=('xdg-utils')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/./}-source.zip"
- '0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch'
- '0002-Makefile-fixed-make-install-not-installing-data-bg.patch')
-sha256sums=('3a895c16dc352dab295ab1e3b7d62f55615bb21ff6d7d8c874787c0a62c64257'
- '53b98896e2385822c1bdc6ab1583696a54d2b7bc88f2cfb73ca4f0c156571af8'
- '08cd8906fbebb980976239f885c902df77ad9708361126389d470c35681dcf71')
-
-prepare() {
- cd Oblige-${pkgver}-source
-
- patch -p 1 -i "$srcdir"/0001-Makefile-Makefile.macos-fixed-for-prefabs-directory-.patch
- patch -p 1 -i "$srcdir"/0002-Makefile-fixed-make-install-not-installing-data-bg.patch
-}
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/./}-source.zip")
+sha256sums=('0d35050a5a3d10c932b44cfcb9d02777012d7ab0b3e2e2ed56bc5b388c068271')
build() {
cd Oblige-${pkgver}-source