[arch-commits] Commit in gnubiff/trunk (PKGBUILD panel_applet_inprocess.patch)

2020-10-22 Thread Balló György via arch-commits 
Date: Thursday, October 22, 2020 @ 12:52:38
  Author: bgyorgy
Revision: 729083

upgpkg: gnubiff 2.2.17-7: Disable gnome-panel support

Modified:
  gnubiff/trunk/PKGBUILD
Deleted:
  gnubiff/trunk/panel_applet_inprocess.patch

--+
 PKGBUILD |   17 --
 panel_applet_inprocess.patch |  260 -
 2 files changed, 5 insertions(+), 272 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-22 12:52:36 UTC (rev 729082)
+++ PKGBUILD2020-10-22 12:52:38 UTC (rev 729083)
@@ -5,33 +5,26 @@
 
 pkgname=gnubiff
 pkgver=2.2.17
-pkgrel=6
+pkgrel=7
 pkgdesc="Mail notification program that checks for mail and displays headers 
when new mail has arrived"
 arch=('x86_64')
 url="http://gnubiff.sourceforge.net/;
 license=('GPL3')
 depends=('gtk3')
-makedepends=('gnome-panel' 'intltool')
-optdepends=('gnome-panel: Applet for GNOME Panel')
+makedepends=('intltool')
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-gnubiff.appdata.xml
-panel_applet_inprocess.patch)
+gnubiff.appdata.xml)
 sha256sums=('e616ab031d493e4b9b27a2bccc810e4b2ada912b3cf8d44f39325cbc5293fb2c'
-'372cec540a50c0f1be01f8e097f5d530dc5f78d571337377048652e62c0cc939'
-'ea229413fde314b8a7bd184d5d37eb6ba9e6929f48b0cf4a86eeeab2e8db32f6')
+'372cec540a50c0f1be01f8e097f5d530dc5f78d571337377048652e62c0cc939')
 
 prepare() {
   cd $pkgname-$pkgver
-  # Fix GNOME Panel applet
-  patch -Np1 -i ../panel_applet_inprocess.patch
-  sed -i 's/Icon=.*$/Icon=gnubiff/' 
src/org.gnome.panel.applet.GnubiffApplet.panel-applet.in.in
   autoreconf -fi
 }
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-fam --with-password 
--with-password-string="65423957eb027b94c9e661611c0e4271"
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  ./configure --prefix=/usr --disable-fam --disable-gnome --with-password 
--with-password-string="65423957eb027b94c9e661611c0e4271"
   make
 }
 

Deleted: panel_applet_inprocess.patch
===
--- panel_applet_inprocess.patch2020-10-22 12:52:36 UTC (rev 729082)
+++ panel_applet_inprocess.patch2020-10-22 12:52:38 UTC (rev 729083)
@@ -1,260 +0,0 @@
-Description: port the GNOME Panel applet to in-process applet
- It is now built as a separate .so file, and the gnubiff executable
- now has no applet-related code.
- .
- The Makefile.am is refactored to support this double build.
-Author: Dmitry Shachnev 
-Forwarded: https://sourceforge.net/p/gnubiff/patches/8/
-Last-Update: 2016-12-02
-
 a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,7 @@
- AC_CONFIG_SRCDIR([src/gnubiff.cc])
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
-+LT_INIT([dlopen disable-static])
- 
- ##
- #   Configure Options#
-@@ -183,12 +184,7 @@
-   AC_SUBST(GNOME_DEP_CFLAGS)
-   AC_SUBST(GNOME_DEP_LIBS)
-   AH_TEMPLATE([USE_GNOME])
--  AC_DEFINE(USE_GNOME)
--  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-   ])
--  if test "x$GCONFTOOL" = "xno"; then
-- AC_MSG_ERROR([gconftool-2 executable not found in your path - should 
be installed with GConf])
--  fi
- fi
- AM_CONDITIONAL(USE_GNOME, test $OPT_USEGNOME = yes, Define to 1 if you want 
to have GNOME support)
- 
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,14 +1,20 @@
--INCLUDES = \
--  $(FAM_CFLAGS) \
--  $(GNUBIFF_DEP_CFLAGS)   
\
--  $(GNOME_DEP_CFLAGS) \
-+AM_CXXFLAGS = \
-+  $(FAM_CFLAGS)   \
-+  $(GNUBIFF_DEP_CFLAGS)   \
-+  $(GNOME_DEP_CFLAGS) \
-+  -Wall -pedantic -export-dynamic
-+
-+AM_CFLAGS = \
-+  $(AM_CXXFLAGS)  \
-+  -ansi
-+
-+AM_CPPFLAGS = \
-   -DGNUBIFF_LOCALEDIR=\""$(datadir)/locale"\" \
-   -DGNUBIFF_DATADIR=\""$(pkgdatadir)"\"   \
-   -DGNUBIFF_ICONDIR=\""$(datadir)/pixmaps"\"  \
-   -DGNUBIFF_UIDIR=\""$(datadir)/gnome-2.0/ui"\"   \
-   -DREAL_DATADIR=\""$(datadir)"\" \
--  -D_GNU_SOURCE   
\
--  -Wall -ansi -pedantic -export-dynamic
-+  -D_GNU_SOURCE
- 
- bin_PROGRAMS = gnubiff
- 
-@@ -16,7 +22,6 @@
-   ui-applet-gnome.cc  ui-applet-gnome.h
- 
- common_sources = \
--  gnubiff.cc  
\
-   biff.cc biff.h  
\
-

[arch-commits] Commit in gnubiff/trunk (PKGBUILD panel_applet_inprocess.patch)

2018-09-07 Thread Balló György via arch-commits 
Date: Saturday, September 8, 2018 @ 01:15:40
  Author: bgyorgy
Revision: 378738

upgpkg: gnubiff 2.2.17-5

Remove gconf makedependency

Modified:
  gnubiff/trunk/PKGBUILD
  gnubiff/trunk/panel_applet_inprocess.patch

--+
 PKGBUILD |6 +++---
 panel_applet_inprocess.patch |   11 ---
 2 files changed, 11 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-08 00:50:00 UTC (rev 378737)
+++ PKGBUILD2018-09-08 01:15:40 UTC (rev 378738)
@@ -6,18 +6,18 @@
 
 pkgname=gnubiff
 pkgver=2.2.17
-pkgrel=4
+pkgrel=5
 pkgdesc="Mail notification program that checks for mail and displays headers 
when new mail has arrived"
 arch=('x86_64')
 url="http://gnubiff.sourceforge.net/;
 license=('GPL3')
 depends=('gtk3')
-makedepends=('gconf' 'gnome-panel' 'intltool')
+makedepends=('gnome-panel' 'intltool')
 optdepends=('gnome-panel: Applet for GNOME Panel')
 source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 panel_applet_inprocess.patch)
 sha256sums=('e616ab031d493e4b9b27a2bccc810e4b2ada912b3cf8d44f39325cbc5293fb2c'
-'a6d1f34f7bcbf29c0ad48e49806755f0bdc34cc5b79082b8a9b3dad9cf317e56')
+'ea229413fde314b8a7bd184d5d37eb6ba9e6929f48b0cf4a86eeeab2e8db32f6')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: panel_applet_inprocess.patch
===
--- panel_applet_inprocess.patch2018-09-08 00:50:00 UTC (rev 378737)
+++ panel_applet_inprocess.patch2018-09-08 01:15:40 UTC (rev 378738)
@@ -17,14 +17,19 @@
  
  ##
  #   Configure Options#
-@@ -183,7 +184,6 @@
+@@ -183,12 +184,7 @@
AC_SUBST(GNOME_DEP_CFLAGS)
AC_SUBST(GNOME_DEP_LIBS)
AH_TEMPLATE([USE_GNOME])
 -  AC_DEFINE(USE_GNOME)
-   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+-  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
])
-   if test "x$GCONFTOOL" = "xno"; then
+-  if test "x$GCONFTOOL" = "xno"; then
+- AC_MSG_ERROR([gconftool-2 executable not found in your path - should 
be installed with GConf])
+-  fi
+ fi
+ AM_CONDITIONAL(USE_GNOME, test $OPT_USEGNOME = yes, Define to 1 if you want 
to have GNOME support)
+ 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,14 +1,20 @@

[arch-commits] Commit in gnubiff/trunk (PKGBUILD panel_applet_inprocess.patch)

2018-01-21 Thread Balló György via arch-commits 
Date: Sunday, January 21, 2018 @ 13:21:44
  Author: bgyorgy
Revision: 284499

upgpkg: gnubiff 2.2.17-4

Adopt the package, enable panel applet

Added:
  gnubiff/trunk/panel_applet_inprocess.patch
Modified:
  gnubiff/trunk/PKGBUILD

--+
 PKGBUILD |   36 +++--
 panel_applet_inprocess.patch |  255 +
 2 files changed, 279 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-21 12:16:17 UTC (rev 284498)
+++ PKGBUILD2018-01-21 13:21:44 UTC (rev 284499)
@@ -1,28 +1,40 @@
 # $Id$
-# Maintainer: Sergej Pupykin 
-# Maintainer: Tom K 
+# Maintainer: Balló György 
+# Contributor: Sergej Pupykin 
+# Contributor: Tom K 
 # Contributor: Todd Musall 
 
 pkgname=gnubiff
 pkgver=2.2.17
-pkgrel=3
+pkgrel=4
 pkgdesc="Mail notification program that checks for mail and displays headers 
when new mail has arrived"
 arch=('x86_64')
 url="http://gnubiff.sourceforge.net/;
-license=("GPL")
-depends=('gtk3' 'popt')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('6371ca2986efdaf1e47bc5a44249513a')
+license=('GPL3')
+depends=('gtk3')
+makedepends=('gconf' 'gnome-panel' 'intltool')
+optdepends=('gnome-panel: Applet for GNOME Panel')
+source=(https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+panel_applet_inprocess.patch)
+sha256sums=('e616ab031d493e4b9b27a2bccc810e4b2ada912b3cf8d44f39325cbc5293fb2c'
+'a6d1f34f7bcbf29c0ad48e49806755f0bdc34cc5b79082b8a9b3dad9cf317e56')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix GNOME Panel applet
+  patch -Np1 -i ../panel_applet_inprocess.patch
+  sed -i 's/Icon=.*$/Icon=gnubiff/' 
src/org.gnome.panel.applet.GnubiffApplet.panel-applet.in.in
+  autoreconf -fi
+}
+
 build() {
-  cd "$srcdir"/gnubiff-$pkgver
-  ./configure --prefix=/usr --with-password 
--with-password-string="65423957eb027b94c9e661611c0e4271" \
-   --disable-fam --disable-gnome
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-fam --with-password 
--with-password-string="65423957eb027b94c9e661611c0e4271"
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd "$srcdir"/gnubiff-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" DATADIRNAME=share install
 }

Added: panel_applet_inprocess.patch
===
--- panel_applet_inprocess.patch(rev 0)
+++ panel_applet_inprocess.patch2018-01-21 13:21:44 UTC (rev 284499)
@@ -0,0 +1,255 @@
+Description: port the GNOME Panel applet to in-process applet
+ It is now built as a separate .so file, and the gnubiff executable
+ now has no applet-related code.
+ .
+ The Makefile.am is refactored to support this double build.
+Author: Dmitry Shachnev 
+Forwarded: https://sourceforge.net/p/gnubiff/patches/8/
+Last-Update: 2016-12-02
+
+--- a/configure.ac
 b/configure.ac
+@@ -40,6 +40,7 @@
+ AC_CONFIG_SRCDIR([src/gnubiff.cc])
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
++LT_INIT([dlopen disable-static])
+ 
+ ##
+ #   Configure Options#
+@@ -183,7 +184,6 @@
+   AC_SUBST(GNOME_DEP_CFLAGS)
+   AC_SUBST(GNOME_DEP_LIBS)
+   AH_TEMPLATE([USE_GNOME])
+-  AC_DEFINE(USE_GNOME)
+   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+   ])
+   if test "x$GCONFTOOL" = "xno"; then
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -1,14 +1,20 @@
+-INCLUDES = \
+-  $(FAM_CFLAGS) \
+-  $(GNUBIFF_DEP_CFLAGS)   
\
+-  $(GNOME_DEP_CFLAGS) \
++AM_CXXFLAGS = \
++  $(FAM_CFLAGS)   \
++  $(GNUBIFF_DEP_CFLAGS)   \
++  $(GNOME_DEP_CFLAGS) \
++  -Wall -pedantic -export-dynamic
++
++AM_CFLAGS = \
++  $(AM_CXXFLAGS)  \
++  -ansi
++
++AM_CPPFLAGS = \
+   -DGNUBIFF_LOCALEDIR=\""$(datadir)/locale"\" \
+   -DGNUBIFF_DATADIR=\""$(pkgdatadir)"\"   \
+   -DGNUBIFF_ICONDIR=\""$(datadir)/pixmaps"\"  \
+   -DGNUBIFF_UIDIR=\""$(datadir)/gnome-2.0/ui"\"   \
+   -DREAL_DATADIR=\""$(datadir)"\" \
+-  -D_GNU_SOURCE   
\
+-  -Wall -ansi -pedantic -export-dynamic
++  -D_GNU_SOURCE
+ 
+ bin_PROGRAMS = gnubiff
+ 
+@@ -16,7 +22,6 @@
+   ui-applet-gnome.cc