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

[Jan Steffens]

    Date: Tuesday, November 1, 2016 @ 19:48:44
  Author: heftig
Revision: 279621

3.22.0-1

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

----------------+
 PKGBUILD       |    9 +++++----
 buildfix.patch |   32 ++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-01 18:27:39 UTC (rev 279620)
+++ PKGBUILD	2016-11-01 19:48:44 UTC (rev 279621)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=gnome-todo
-pkgver=3.20.2+6+g8f1522f
+pkgver=3.22.0
 pkgrel=1
 pkgdesc="Task manager for GNOME"
 url="https://wiki.gnome.org/Apps/Todo"
@@ -10,12 +10,13 @@
 license=(GPL)
 depends=(evolution-data-server libpeas)
 makedepends=(intltool gobject-introspection gnome-common appstream-glib git)
+optdepends=('python3: Some plugins')
 groups=(gnome-extra)
-_commit=8f1522fd8e0f325a22c5f567c07992011dcf01be  # gnome-3-20
+_commit=91f637802625290e1024f90768df0a4caabafd72  # tags/GNOME_TODO_3_22_0^0
 source=("git://git.gnome.org/gnome-todo#commit=$_commit"
         buildfix.patch)
 sha256sums=('SKIP'
-            'ab88726d81ba076dd30067c0ccb08fe946b76b06c6e8664648d2ac1ff496f821')
+            '5018a974f63ef29801740638638b08a5766ddebfd004fe162acfed8022b6a415')
 
 pkgver() {
   cd $pkgname
@@ -24,7 +25,6 @@
 
 prepare() {
   cd $pkgname
-  git tag -f GNOME_TODO_3_20_2 50f0362fb87355d9cfed95c9c69b3f383a5eaa85
   patch -Np1 -i ../buildfix.patch
   NOCONFIGURE=1 ./autogen.sh
 }
@@ -32,6 +32,7 @@
 build() {
   cd $pkgname
   ./configure --prefix=/usr
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Deleted: buildfix.patch
===================================================================
--- buildfix.patch	2016-11-01 18:27:39 UTC (rev 279620)
+++ buildfix.patch	2016-11-01 19:48:44 UTC (rev 279621)
@@ -1,14 +0,0 @@
-diff -u -r gnome-todo-3.20.0/src/Makefile.am gnome-todo-3.20.0-buildfix/src/Makefile.am
---- gnome-todo-3.20.0/src/Makefile.am	2016-03-14 23:07:22.000000000 +0100
-+++ gnome-todo-3.20.0-buildfix/src/Makefile.am	2016-03-30 22:08:24.161223740 +0200
-@@ -98,8 +98,8 @@
- 	$(GNOME_TODO_WARN_LDFLAGS)
- 
- gnome_todo_LDADD = \
--	$(GNOME_TODO_LIBS) \
--	$(top_builddir)/plugins/eds/libeds.a
-+	$(top_builddir)/plugins/eds/libeds.a \
-+	$(GNOME_TODO_LIBS)
- 
- gnome_todo_DEPENDENCIES = \
- 	$(top_builddir)/plugins/eds/libeds.a

Added: buildfix.patch
===================================================================
--- buildfix.patch	                        (rev 0)
+++ buildfix.patch	2016-11-01 19:48:44 UTC (rev 279621)
@@ -0,0 +1,18 @@
+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 \