[arch-commits] Commit in gnome-todo/trunk (PKGBUILD buildfix.patch)

[Jan de Groot]

    Date: Saturday, April 22, 2017 @ 21:20:39
  Author: jgc
Revision: 293995

upgpkg: gnome-todo 3.22.1+15+g9f9cd9e-1

Fix build

Modified:
  gnome-todo/trunk/PKGBUILD
Deleted:
  gnome-todo/trunk/buildfix.patch

----------------+
 PKGBUILD       |   16 +++++++---------
 buildfix.patch |   18 ------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-22 20:57:49 UTC (rev 293994)
+++ PKGBUILD	2017-04-22 21:20:39 UTC (rev 293995)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=gnome-todo
-pkgver=3.22.1
+pkgver=3.22.1+15+g9f9cd9e
 pkgrel=1
 pkgdesc="Task manager for GNOME"
 url="https://wiki.gnome.org/Apps/Todo"
@@ -12,11 +12,9 @@
 makedepends=(intltool gobject-introspection gnome-common appstream-glib git)
 optdepends=('python3: Some plugins')
 groups=(gnome-extra)
-_commit=ffe016ce5874cf8d70ce29cd96bf948d977c6025  # tags/GNOME_TODO_3_22_1^0
-source=("git+https://git.gnome.org/browse/gnome-todo#commit=$_commit"
-        buildfix.patch)
-sha256sums=('SKIP'
-            '5018a974f63ef29801740638638b08a5766ddebfd004fe162acfed8022b6a415')
+_commit=9f9cd9ea58ebc47e3ed2fb59f0e4de629cf2dd0b  # gnome-3-22
+source=("git+https://git.gnome.org/browse/gnome-todo#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,15 +23,15 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../buildfix.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd $pkgname
-  ./configure --prefix=/usr
+  CPPFLAGS+=" -O"
+  ./configure --prefix=/usr --disable-maintainer-mode --disable-debug
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  make V=1
 }
 
 package() {

Deleted: buildfix.patch
===================================================================
--- buildfix.patch	2017-04-22 20:57:49 UTC (rev 293994)
+++ buildfix.patch	2017-04-22 21:20:39 UTC (rev 293995)
@@ -1,18 +0,0 @@
-diff --git i/src/Makefile.am w/src/Makefile.am
-index 094d4637d1dba597..f6d1194e362a61fb 100644
---- i/src/Makefile.am
-+++ w/src/Makefile.am
-@@ -104,11 +104,11 @@ gnome_todo_LDFLAGS = \
- 	$(GNOME_TODO_WARN_LDFLAGS)
- 
- gnome_todo_LDADD = \
--	$(GNOME_TODO_LIBS) \
- 	$(top_builddir)/plugins/eds/libeds.la \
- 	$(top_builddir)/plugins/dark-theme/libdarktheme.la \
- 	$(top_builddir)/plugins/scheduled-panel/libscheduledpanel.la \
--	$(top_builddir)/plugins/today-panel/libtodaypanel.la
-+	$(top_builddir)/plugins/today-panel/libtodaypanel.la \
-+	$(GNOME_TODO_LIBS)
- 
- gnome_todo_DEPENDENCIES = \
- 	$(top_builddir)/plugins/eds/libeds.la \