Date: Friday, December 25, 2020 @ 23:00:25
Author: arojas
Revision: 791099
Update to 1.3.0
Modified:
grsync/trunk/PKGBUILD
grsync/trunk/use-themed-icon.patch
Deleted:
grsync/trunk/grsync-1.2.6-gcc-10.patch
grsync/trunk/gtk3-port.patch
---------------------------+
PKGBUILD | 16 ----
grsync-1.2.6-gcc-10.patch | 36 -----------
gtk3-port.patch | 142 --------------------------------------------
use-themed-icon.patch | 18 ++---
4 files changed, 12 insertions(+), 200 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-25 22:59:48 UTC (rev 791098)
+++ PKGBUILD 2020-12-25 23:00:25 UTC (rev 791099)
@@ -3,7 +3,7 @@
# Contributor: William Rea <sillywi...@gmail.com>
pkgname=grsync
-pkgver=1.2.8
+pkgver=1.3.0
pkgrel=1
pkgdesc="GTK+ GUI for rsync to synchronize folders, files and make backups"
arch=('x86_64')
@@ -13,24 +13,14 @@
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=('94ea5faca67e3df467b5283377af3cb32b2b47631b6a32d38bc7b371209306b1'
+sha256sums=('b7c7c6a62e05302d8317c38741e7d71ef9ab4639ee5bff2622a383b2043a35fc'
'5dee994cafbcf8adfda34767cbd60f7eb2039bdeccab2dfd879f045bd11fb9fd'
- '898d3a4d50158409f55cf87ff0977edfff6bc3e69868f3d4d5f1037d9923fc03'
- '90c721af2039590e8caaa3ae31bc81981485936bf2452e3e17101772ca8705ef'
- '490108a9b65750162786f9aa230668736502477ce260ad1948f9d0124d5fb207')
+ 'c004d8c5c7c803ff42393bb43d022c7fe1c4a25d1f78a841de8df7ea255d4862')
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
-
# Use themed icon
patch -Np1 -i ../use-themed-icon.patch
Deleted: grsync-1.2.6-gcc-10.patch
===================================================================
--- grsync-1.2.6-gcc-10.patch 2020-12-25 22:59:48 UTC (rev 791098)
+++ grsync-1.2.6-gcc-10.patch 2020-12-25 23:00:25 UTC (rev 791099)
@@ -1,36 +0,0 @@
-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);
Deleted: gtk3-port.patch
===================================================================
--- gtk3-port.patch 2020-12-25 22:59:48 UTC (rev 791098)
+++ gtk3-port.patch 2020-12-25 23:00:25 UTC (rev 791099)
@@ -1,142 +0,0 @@
-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
-
-+AC_ARG_ENABLE([gtk3],
-+ [AC_HELP_STRING([--enable-gtk3],
-+ [compile grsync against gtk+ 3.0 (default: yes)])],
-+ [enable_gtk3="${enableval}"],
-+ [enable_gtk3="yes"]
-+)
-+
- PKG_CHECK_EXISTS(maemo-version, [VERSIONOK=`$PKG_CONFIG --atleast-version=5
maemo-version`
- if test
x"$VERSIONOK" != x; then
-
AC_MSG_ERROR([You need at least Maemo 5.x for this release of Grsync])
-@@ -34,7 +41,13 @@
- MAEMO=0
- XMLFILE="grsync.glade"
- AC_DEFINE_UNQUOTED(XMLFILE, ["$XMLFILE"], [UI
Description XML File])
--pkg_modules="gtk+-2.0 >= 2.16.0"
-+
-+ if test x"$enable_gtk3" = x"yes"; then
-+ GTK_API_VERSION="3.0"
-+ else
-+ GTK_API_VERSION="2.0"
-+ fi
-+ pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0"
- OTHER_DESKTOP_ENTRIES="Icon=grsync.png"
-
MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'"
- MIME_OSSOCAT=""
-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>
- <property
name="border_width">4</property>
-- <property
name="homogeneous">True</property>
- <child>
- <object
class="GtkTable" id="table_basic">
- <property
name="visible">True</property>
-@@ -1313,7 +1312,6 @@
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="transient_for">main_window</property>
-- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
-@@ -1414,7 +1412,6 @@
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="transient_for">main_window</property>
-- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
-@@ -1651,7 +1648,6 @@
- <property name="skip_pager_hint">True</property>
- <property name="urgency_hint">True</property>
- <property name="transient_for">dialog_rsync</property>
-- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox3">
- <property name="visible">True</property>
-@@ -1736,7 +1732,6 @@
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="transient_for">main_window</property>
-- <property name="has_separator">False</property>
- <signal name="hide" handler="on_rsync_hide"/>
- <signal name="show" handler="on_rsync_show"/>
- <signal name="delete_event"
handler="gtk_widget_hide_on_delete"/>
-@@ -1930,7 +1925,6 @@
- <property name="skip_taskbar_hint">True</property>
- <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">
-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) {
- trayIcon = gtk_status_icon_new_from_file(icon);
-- g_signal_connect(GTK_STATUS_ICON(trayIcon), "activate",
GTK_SIGNAL_FUNC(on_trayicon_activate), main_window);
-+ g_signal_connect(GTK_STATUS_ICON(trayIcon), "activate",
G_CALLBACK(on_trayicon_activate), main_window);
- }
- } else {
- if (trayIcon != NULL) {
-@@ -111,7 +111,7 @@
- void set_main_title(gchar* session, gchar* extra) {
- gchar *stmp = g_strconcat("Grsync: ", session, " ", extra, NULL);
- gtk_window_set_title((GtkWindow*) main_window, stmp);
-- if (trayIcon != NULL) gtk_status_icon_set_tooltip(trayIcon, stmp);
-+ if (trayIcon != NULL) gtk_status_icon_set_tooltip_text(trayIcon, stmp);
- g_free(stmp);
- }
-
-@@ -815,7 +815,7 @@
- }
-
-
--void on_main_destroy(GtkObject *object, gpointer user_data) {
-+void on_main_destroy(GtkWidget *object, gpointer user_data) {
- gint sel = gtk_combo_box_get_active((GtkComboBox*)
gtk_builder_get_object(builder, "combo_session"));
- save_settings(groups[sel], NULL);
- g_strfreev(groups);
-@@ -860,7 +860,7 @@
- gtk_widget_hide(rsync_window);
- }
- }
-- 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);
- }
-
-
-@@ -1177,7 +1177,7 @@
- }
-
-
--void on_rsync_hide(GtkObject *object, gpointer user_data) {
-+void on_rsync_hide(GtkWidget *object, gpointer user_data) {
- if (rsync_pid) {
- if (paused) superkill(SIGCONT);
- superkill(SIGTERM);
-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
-
-- gtk_set_locale();
- #ifdef MAEMO
- hildon_gtk_init(&argc, &argv);
- #else
Modified: use-themed-icon.patch
===================================================================
--- use-themed-icon.patch 2020-12-25 22:59:48 UTC (rev 791098)
+++ use-themed-icon.patch 2020-12-25 23:00:25 UTC (rev 791099)
@@ -1,15 +1,15 @@
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.000000000 +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=""
- )
+@@ -30,7 +30,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.000000000 +0200
+++ grsync-1.2.6/Makefile.am 2018-12-30 11:37:36.995541833 +0100
