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
===================================================================
--- PKGBUILD 2020-05-27 16:35:15 UTC (rev 635941)
+++ PKGBUILD 2020-05-27 16:53:56 UTC (rev 635942)
@@ -3,8 +3,8 @@
# Contributor: William Rea <sillywi...@gmail.com>
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.000000000 +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.000000000 +0200
++++ grsync-1.2.6/src/main.c 2020-02-27 11:35:08.548834429 +0100
+@@ -10,6 +10,12 @@
+ # include <libosso.h>
+ #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.in 2018-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.glade 2018-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
++++ grsync-1.2.8/grsync.glade 2020-05-27 18:17:16.919303348 +0200
@@ -322,7 +322,6 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
@@ -78,12 +78,12 @@
<property name="skip_pager_hint">True</property>
<property name="transient_for">main_window</property>
- <property name="has_separator">False</property>
+ <signal name="delete_event"
handler="gtk_widget_hide_on_delete"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox5">
- <property name="visible">True</property>
-diff -Naur grsync.orig/src/callbacks.c grsync/src/callbacks.c
---- grsync.orig/src/callbacks.c 2018-01-22 12:58:21.513554000 +0100
-+++ grsync/src/callbacks.c 2018-01-22 14:48:19.384135657 +0100
+diff -Naur grsync-1.2.8.orig/src/callbacks.c grsync-1.2.8/src/callbacks.c
+--- grsync-1.2.8.orig/src/callbacks.c 2020-05-03 16:36:45.000000000 +0200
++++ grsync-1.2.8/src/callbacks.c 2020-05-27 18:19:00.715749541 +0200
@@ -58,7 +58,7 @@
if (flag) {
if (trayIcon == NULL) {
@@ -115,8 +115,8 @@
gtk_widget_hide(rsync_window);
}
}
-- if (cmdline_execute) on_main_destroy((GtkObject*) main_window, NULL);
-+ if (cmdline_execute) on_main_destroy((GtkWidget*) main_window, NULL);
+- if (cmdline_execute && !more && !cmdline_stayopen)
on_main_destroy((GtkObject*) main_window, NULL);
++ if (cmdline_execute && !more && !cmdline_stayopen)
on_main_destroy((GtkWidget*) main_window, NULL);
}
@@ -129,9 +129,9 @@
if (rsync_pid) {
if (paused) superkill(SIGCONT);
superkill(SIGTERM);
-diff -Naur grsync.orig/src/main.c grsync/src/main.c
---- grsync.orig/src/main.c 2018-01-22 12:58:21.516888000 +0100
-+++ grsync/src/main.c 2018-01-22 14:48:22.214212877 +0100
+diff -Naur grsync-1.2.8.orig/src/main.c grsync-1.2.8/src/main.c
+--- grsync-1.2.8.orig/src/main.c 2013-04-30 13:48:54.000000000 +0200
++++ grsync-1.2.8/src/main.c 2020-05-27 18:19:30.537013492 +0200
@@ -17,7 +17,6 @@
textdomain(GETTEXT_PACKAGE);
#endif
