[arch-commits] Commit in grsync/trunk (3 files)
Date: Wednesday, May 27, 2020 @ 16:53:56
Author: bgyorgy
Revision: 635942
upgpkg: grsync 1.2.8-1: Update to new version
Added:
grsync/trunk/grsync-1.2.6-gcc-10.patch
Modified:
grsync/trunk/PKGBUILD
grsync/trunk/gtk3-port.patch
---+
PKGBUILD | 13 +
grsync-1.2.6-gcc-10.patch | 36
gtk3-port.patch | 30 +++---
3 files changed, 60 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-27 16:35:15 UTC (rev 635941)
+++ PKGBUILD2020-05-27 16:53:56 UTC (rev 635942)
@@ -3,8 +3,8 @@
# Contributor: William Rea
pkgname=grsync
-pkgver=1.2.6
-pkgrel=4
+pkgver=1.2.8
+pkgrel=1
pkgdesc="GTK+ GUI for rsync to synchronize folders, files and make backups"
arch=('x86_64')
url="http://www.opbyte.it/grsync/;
@@ -13,15 +13,20 @@
makedepends=('intltool')
source=(http://www.opbyte.it/release/$pkgname-$pkgver.tar.gz
grsync.appdata.xml
+grsync-1.2.6-gcc-10.patch
gtk3-port.patch
use-themed-icon.patch)
-sha256sums=('66d5acea5e6767d6ed2082e1c6e250fe809cb1e797cbbee5c8e8a2d28a895619'
+sha256sums=('94ea5faca67e3df467b5283377af3cb32b2b47631b6a32d38bc7b371209306b1'
'5dee994cafbcf8adfda34767cbd60f7eb2039bdeccab2dfd879f045bd11fb9fd'
-'96d8911ee969b943ae0c69896d3d95271e9a794bfd8c8ce865282cd0c13011eb'
+'898d3a4d50158409f55cf87ff0977edfff6bc3e69868f3d4d5f1037d9923fc03'
+'90c721af2039590e8caaa3ae31bc81981485936bf2452e3e17101772ca8705ef'
'490108a9b65750162786f9aa230668736502477ce260ad1948f9d0124d5fb207')
prepare() {
cd $pkgname-$pkgver
+
+ # Fix build with GCC10
+ patch -Np1 -i ../grsync-1.2.6-gcc-10.patch
# Port to GTK+ 3
patch -Np1 -i ../gtk3-port.patch
Added: grsync-1.2.6-gcc-10.patch
===
--- grsync-1.2.6-gcc-10.patch (rev 0)
+++ grsync-1.2.6-gcc-10.patch 2020-05-27 16:53:56 UTC (rev 635942)
@@ -0,0 +1,36 @@
+diff -Naur grsync-1.2.6.orig/src/callbacks.h grsync-1.2.6/src/callbacks.h
+--- grsync-1.2.6.orig/src/callbacks.h 2013-04-30 13:48:54.0 +0200
grsync-1.2.6/src/callbacks.h 2020-02-27 11:34:50.861824303 +0100
+@@ -7,11 +7,11 @@
+ #define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE
+ #define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY
+
+-GtkBuilder *builder;
+-GtkWidget *main_window;
+-gchar *argv_session, *argv_filename, *icon, *icon_busy;
+-gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
+-GtkListStore *liststore_session;
++extern GtkBuilder *builder;
++extern GtkWidget *main_window;
++extern gchar *argv_session, *argv_filename, *icon, *icon_busy;
++extern gboolean cmdline_session, cmdline_execute, cmdline_stayopen,
cmdline_import;
++extern GtkListStore *liststore_session;
+
+ void save_settings(gchar *session, gchar *filename);
+ gboolean load_groups(gchar *session);
+diff -Naur grsync-1.2.6.orig/src/main.c grsync-1.2.6/src/main.c
+--- grsync-1.2.6.orig/src/main.c 2013-04-30 13:48:54.0 +0200
grsync-1.2.6/src/main.c2020-02-27 11:35:08.548834429 +0100
+@@ -10,6 +10,12 @@
+ # include
+ #endif
+
++GtkBuilder *builder;
++GtkWidget *main_window;
++gchar *argv_session, *argv_filename, *icon, *icon_busy;
++gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
++GtkListStore *liststore_session;
++
+ int main (int argc, char *argv[]) {
+ #ifdef ENABLE_NLS
+ bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
Modified: gtk3-port.patch
===
--- gtk3-port.patch 2020-05-27 16:35:15 UTC (rev 635941)
+++ gtk3-port.patch 2020-05-27 16:53:56 UTC (rev 635942)
@@ -1,6 +1,6 @@
-diff -Naur grsync.orig/configure.in grsync/configure.in
grsync.orig/configure.in 2018-01-22 12:58:21.350217000 +0100
-+++ grsync/configure.in2018-01-22 17:15:38.718528840 +0100
+diff -Naur grsync-1.2.8.orig/configure.in grsync-1.2.8/configure.in
+--- grsync-1.2.8.orig/configure.in 2020-05-27 18:16:14.058381000 +0200
grsync-1.2.8/configure.in 2020-05-27 18:16:34.514237609 +0200
@@ -14,6 +14,13 @@
AM_PROG_CC_STDC
AC_HEADER_STDC
@@ -30,9 +30,9 @@
OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
MIME_OSSOCAT=""
-diff -Naur grsync.orig/grsync.glade grsync/grsync.glade
grsync.orig/grsync.glade 2018-01-22 12:58:21.026876000 +0100
-+++ grsync/grsync.glade2018-01-22 14:48:21.114182860 +0100
+diff -Naur grsync-1.2.8.orig/grsync.glade grsync-1.2.8/grsync.glade
+--- grsync-1.2.8.orig/grsync.glade 2020-05-27 18:16:18.081553000 +0200
[arch-commits] Commit in grsync/trunk (3 files)
Date: Sunday, December 30, 2018 @ 11:04:56
Author: bgyorgy
Revision: 419088
upgpkg: grsync 1.2.6-4
Add AppStream metadata, use themed icon
Added:
grsync/trunk/grsync.appdata.xml
grsync/trunk/use-themed-icon.patch
Modified:
grsync/trunk/PKGBUILD
---+
PKGBUILD | 16 +++-
grsync.appdata.xml| 19 ++
use-themed-icon.patch | 88
3 files changed, 120 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-30 11:04:43 UTC (rev 419087)
+++ PKGBUILD2018-12-30 11:04:56 UTC (rev 419088)
@@ -4,7 +4,7 @@
pkgname=grsync
pkgver=1.2.6
-pkgrel=3
+pkgrel=4
pkgdesc="GTK+ GUI for rsync to synchronize folders, files and make backups"
arch=('x86_64')
url="http://www.opbyte.it/grsync/;
@@ -12,14 +12,23 @@
depends=('gtk3' 'rsync')
makedepends=('intltool')
source=(http://www.opbyte.it/release/$pkgname-$pkgver.tar.gz
-gtk3-port.patch)
+grsync.appdata.xml
+gtk3-port.patch
+use-themed-icon.patch)
sha256sums=('66d5acea5e6767d6ed2082e1c6e250fe809cb1e797cbbee5c8e8a2d28a895619'
-'96d8911ee969b943ae0c69896d3d95271e9a794bfd8c8ce865282cd0c13011eb')
+'5dee994cafbcf8adfda34767cbd60f7eb2039bdeccab2dfd879f045bd11fb9fd'
+'96d8911ee969b943ae0c69896d3d95271e9a794bfd8c8ce865282cd0c13011eb'
+'490108a9b65750162786f9aa230668736502477ce260ad1948f9d0124d5fb207')
prepare() {
cd $pkgname-$pkgver
+
# Port to GTK+ 3
patch -Np1 -i ../gtk3-port.patch
+
+ # Use themed icon
+ patch -Np1 -i ../use-themed-icon.patch
+
autoreconf -fi
}
@@ -32,4 +41,5 @@
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
+ install -Dm644 ../$pkgname.appdata.xml
"$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
}
Added: grsync.appdata.xml
===
--- grsync.appdata.xml (rev 0)
+++ grsync.appdata.xml 2018-12-30 11:04:56 UTC (rev 419088)
@@ -0,0 +1,19 @@
+
+
+ it.opbyte.grsync
+ grsync.desktop
+ Grsync
+ Synchronize files and folders (a GTK GUI for rsync)
+ CC0-1.0
+ GPL-2.0
+
+Grsync is a rsync GUI (Graphical User Interface). Rsync is the
well-known and powerful command line directory and file synchronization tool.
It can be effectively used to synchronize local directories and it supports
remote targets as well (even though it doesn't support browsing the remote
folder). Sample uses of grsync include: synchronize a music collection with
removable devices, backup personal files to a networked drive, replication of a
partition to another one, mirroring of files, etc.
+
+
+
+ http://www.opbyte.it/grsync/grsync-1.0.0.png
+
+
+ https://sourceforge.net/p/grsync/bugs/
+ http://www.opbyte.it/grsync/
+
Added: use-themed-icon.patch
===
--- use-themed-icon.patch (rev 0)
+++ use-themed-icon.patch 2018-12-30 11:04:56 UTC (rev 419088)
@@ -0,0 +1,88 @@
+diff -Naur grsync-1.2.6.orig/configure.in grsync-1.2.6/configure.in
+--- grsync-1.2.6.orig/configure.in 2016-03-15 14:08:19.0 +0100
grsync-1.2.6/configure.in 2018-12-30 11:36:44.314049975 +0100
+@@ -48,7 +48,7 @@
+GTK_API_VERSION="2.0"
+fi
+pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0"
+- OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
++ OTHER_DESKTOP_ENTRIES="Icon=grsync"
+
MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
+MIME_OSSOCAT=""
+ )
+diff -Naur grsync-1.2.6.orig/Makefile.am grsync-1.2.6/Makefile.am
+--- grsync-1.2.6.orig/Makefile.am 2013-04-30 13:48:54.0 +0200
grsync-1.2.6/Makefile.am 2018-12-30 11:37:36.995541833 +0100
+@@ -61,10 +61,10 @@
+ mimepackagesdir = $(mimedir)/packages
+ dist_mimepackages_DATA = grsync.xml
+
+-pixmapdir = $(datadir)/pixmaps
++pixmapdir = $(datadir)/icons/hicolor/128x128/apps
+ pixmap_DATA = pixmaps/grsync.png
+
+-pixmapbusydir = $(datadir)/pixmaps
++pixmapbusydir = $(datadir)/icons/hicolor/128x128/apps
+ pixmapbusy_DATA = pixmaps/grsync-busy.png
+
+ mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes/
+diff -Naur grsync-1.2.6.orig/src/callbacks.c grsync-1.2.6/src/callbacks.c
+--- grsync-1.2.6.orig/src/callbacks.c 2015-12-23 16:38:40.0 +0100
grsync-1.2.6/src/callbacks.c 2018-12-30 11:41:43.179172285 +0100
+@@ -57,7 +57,7 @@
+ void set_trayicon(gboolean flag) {
+ if (flag) {
+ if (trayIcon == NULL) {
+- trayIcon = gtk_status_icon_new_from_file(icon);
++
