[arch-commits] Commit in grsync/repos/community-x86_64 (9 files)
Balló György
bgyorgy at archlinux.org
Wed May 27 16:54:04 UTC 2020
Date: Wednesday, May 27, 2020 @ 16:54:03
Author: bgyorgy
Revision: 635943
archrelease: copy trunk to community-x86_64
Added:
grsync/repos/community-x86_64/PKGBUILD
(from rev 635942, grsync/trunk/PKGBUILD)
grsync/repos/community-x86_64/grsync-1.2.6-gcc-10.patch
(from rev 635942, grsync/trunk/grsync-1.2.6-gcc-10.patch)
grsync/repos/community-x86_64/grsync.appdata.xml
(from rev 635942, grsync/trunk/grsync.appdata.xml)
grsync/repos/community-x86_64/gtk3-port.patch
(from rev 635942, grsync/trunk/gtk3-port.patch)
grsync/repos/community-x86_64/use-themed-icon.patch
(from rev 635942, grsync/trunk/use-themed-icon.patch)
Deleted:
grsync/repos/community-x86_64/PKGBUILD
grsync/repos/community-x86_64/grsync.appdata.xml
grsync/repos/community-x86_64/gtk3-port.patch
grsync/repos/community-x86_64/use-themed-icon.patch
---------------------------+
PKGBUILD | 95 +++++++-------
grsync-1.2.6-gcc-10.patch | 36 +++++
grsync.appdata.xml | 38 ++---
gtk3-port.patch | 284 ++++++++++++++++++++++----------------------
use-themed-icon.patch | 176 +++++++++++++--------------
5 files changed, 335 insertions(+), 294 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-27 16:53:56 UTC (rev 635942)
+++ PKGBUILD 2020-05-27 16:54:03 UTC (rev 635943)
@@ -1,45 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=grsync
-pkgver=1.2.6
-pkgrel=4
-pkgdesc="GTK+ GUI for rsync to synchronize folders, files and make backups"
-arch=('x86_64')
-url="http://www.opbyte.it/grsync/"
-license=('GPL')
-depends=('gtk3' 'rsync')
-makedepends=('intltool')
-source=(http://www.opbyte.it/release/$pkgname-$pkgver.tar.gz
- grsync.appdata.xml
- gtk3-port.patch
- use-themed-icon.patch)
-sha256sums=('66d5acea5e6767d6ed2082e1c6e250fe809cb1e797cbbee5c8e8a2d28a895619'
- '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
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --disable-unity
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
-}
Copied: grsync/repos/community-x86_64/PKGBUILD (from rev 635942, grsync/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-27 16:54:03 UTC (rev 635943)
@@ -0,0 +1,50 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=grsync
+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/"
+license=('GPL')
+depends=('gtk3' 'rsync')
+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'
+ '5dee994cafbcf8adfda34767cbd60f7eb2039bdeccab2dfd879f045bd11fb9fd'
+ '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
+
+ # Use themed icon
+ patch -Np1 -i ../use-themed-icon.patch
+
+ autoreconf -fi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --disable-unity
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
+}
Copied: grsync/repos/community-x86_64/grsync-1.2.6-gcc-10.patch (from rev 635942, grsync/trunk/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:54:03 UTC (rev 635943)
@@ -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);
Deleted: grsync.appdata.xml
===================================================================
--- grsync.appdata.xml 2020-05-27 16:53:56 UTC (rev 635942)
+++ grsync.appdata.xml 2020-05-27 16:54:03 UTC (rev 635943)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
- <id>it.opbyte.grsync</id>
- <launchable type="desktop-id">grsync.desktop</launchable>
- <name>Grsync</name>
- <summary>Synchronize files and folders (a GTK GUI for rsync)</summary>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0</project_license>
- <description>
- <p>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.</p>
- </description>
- <screenshots>
- <screenshot type="default">
- <image>http://www.opbyte.it/grsync/grsync-1.0.0.png</image>
- </screenshot>
- </screenshots>
- <url type="bugtracker">https://sourceforge.net/p/grsync/bugs/</url>
- <url type="homepage">http://www.opbyte.it/grsync/</url>
-</component>
Copied: grsync/repos/community-x86_64/grsync.appdata.xml (from rev 635942, grsync/trunk/grsync.appdata.xml)
===================================================================
--- grsync.appdata.xml (rev 0)
+++ grsync.appdata.xml 2020-05-27 16:54:03 UTC (rev 635943)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+ <id>it.opbyte.grsync</id>
+ <launchable type="desktop-id">grsync.desktop</launchable>
+ <name>Grsync</name>
+ <summary>Synchronize files and folders (a GTK GUI for rsync)</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0</project_license>
+ <description>
+ <p>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.</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>http://www.opbyte.it/grsync/grsync-1.0.0.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="bugtracker">https://sourceforge.net/p/grsync/bugs/</url>
+ <url type="homepage">http://www.opbyte.it/grsync/</url>
+</component>
Deleted: gtk3-port.patch
===================================================================
--- gtk3-port.patch 2020-05-27 16:53:56 UTC (rev 635942)
+++ gtk3-port.patch 2020-05-27 16:54:03 UTC (rev 635943)
@@ -1,142 +0,0 @@
-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
-@@ -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.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
-@@ -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>
- <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
-@@ -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) on_main_destroy((GtkObject*) main_window, NULL);
-+ if (cmdline_execute) 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.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
-@@ -17,7 +17,6 @@
- textdomain(GETTEXT_PACKAGE);
- #endif
-
-- gtk_set_locale();
- #ifdef MAEMO
- hildon_gtk_init(&argc, &argv);
- #else
Copied: grsync/repos/community-x86_64/gtk3-port.patch (from rev 635942, grsync/trunk/gtk3-port.patch)
===================================================================
--- gtk3-port.patch (rev 0)
+++ gtk3-port.patch 2020-05-27 16:54:03 UTC (rev 635943)
@@ -0,0 +1,142 @@
+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
Deleted: use-themed-icon.patch
===================================================================
--- use-themed-icon.patch 2020-05-27 16:53:56 UTC (rev 635942)
+++ use-themed-icon.patch 2020-05-27 16:54:03 UTC (rev 635943)
@@ -1,88 +0,0 @@
-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=""
- )
-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
-@@ -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.000000000 +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);
-+ trayIcon = gtk_status_icon_new_from_icon_name(ICON);
- g_signal_connect(GTK_STATUS_ICON(trayIcon), "activate", G_CALLBACK(on_trayicon_activate), main_window);
- }
- } else {
-@@ -71,7 +71,7 @@
-
-
- void set_trayicon_icon(gboolean busy) {
-- if (trayIcon != NULL) gtk_status_icon_set_from_file(trayIcon, busy ? icon_busy : icon);
-+ if (trayIcon != NULL) gtk_status_icon_set_from_icon_name(trayIcon, busy ? ICON_BUSY : ICON);
- }
-
- gboolean get_checkbox(gchar* name) {
-@@ -1341,7 +1341,7 @@
-
- gtk_show_about_dialog((GtkWindow*) main_window, "name", PACKAGE, "version", VERSION, "comments", _("Synchronize files and folders (a GTK GUI for rsync)."),
- "copyright", _("(C) Piero Orsoni and others. Released under the GPL.\nSee COPYING for details"),
-- "website", "http://www.opbyte.it/grsync/", "artists", artists, "authors", authors, NULL);
-+ "website", "http://www.opbyte.it/grsync/", "artists", artists, "authors", authors, "logo-icon-name", ICON, NULL);
- }
-
-
-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 2018-12-30 11:41:13.194991363 +0100
-@@ -2,10 +2,8 @@
- #define MAXOPT 100
- #define CONFIG_GROUP "__CONFIG"
-
--#define ICON_SOURCE "pixmaps/grsync.png"
--#define ICON_SOURCE_BUSY "pixmaps/grsync-busy.png"
--#define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE
--#define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY
-+#define ICON "grsync"
-+#define ICON_BUSY "grsync-busy"
-
- GtkBuilder *builder;
- GtkWidget *main_window;
-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 2018-12-30 11:41:45.745911502 +0100
-@@ -68,9 +68,7 @@
- cmdline_import = FALSE;
- }
-
-- icon = g_file_test(ICON_SOURCE, G_FILE_TEST_EXISTS) ? ICON_SOURCE : ICON_PACKAGE;
-- icon_busy = g_file_test(ICON_SOURCE_BUSY, G_FILE_TEST_EXISTS) ? ICON_SOURCE_BUSY : ICON_PACKAGE_BUSY;
-- gtk_window_set_default_icon_from_file(icon, NULL);
-+ gtk_window_set_default_icon_name(ICON);
-
- builder = gtk_builder_new();
- result = gtk_builder_add_from_file(builder, XMLFILE, &gerror) || gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/" PACKAGE "/" XMLFILE, NULL);
Copied: grsync/repos/community-x86_64/use-themed-icon.patch (from rev 635942, grsync/trunk/use-themed-icon.patch)
===================================================================
--- use-themed-icon.patch (rev 0)
+++ use-themed-icon.patch 2020-05-27 16:54:03 UTC (rev 635943)
@@ -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.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=""
+ )
+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
+@@ -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.000000000 +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);
++ trayIcon = gtk_status_icon_new_from_icon_name(ICON);
+ g_signal_connect(GTK_STATUS_ICON(trayIcon), "activate", G_CALLBACK(on_trayicon_activate), main_window);
+ }
+ } else {
+@@ -71,7 +71,7 @@
+
+
+ void set_trayicon_icon(gboolean busy) {
+- if (trayIcon != NULL) gtk_status_icon_set_from_file(trayIcon, busy ? icon_busy : icon);
++ if (trayIcon != NULL) gtk_status_icon_set_from_icon_name(trayIcon, busy ? ICON_BUSY : ICON);
+ }
+
+ gboolean get_checkbox(gchar* name) {
+@@ -1341,7 +1341,7 @@
+
+ gtk_show_about_dialog((GtkWindow*) main_window, "name", PACKAGE, "version", VERSION, "comments", _("Synchronize files and folders (a GTK GUI for rsync)."),
+ "copyright", _("(C) Piero Orsoni and others. Released under the GPL.\nSee COPYING for details"),
+- "website", "http://www.opbyte.it/grsync/", "artists", artists, "authors", authors, NULL);
++ "website", "http://www.opbyte.it/grsync/", "artists", artists, "authors", authors, "logo-icon-name", ICON, NULL);
+ }
+
+
+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 2018-12-30 11:41:13.194991363 +0100
+@@ -2,10 +2,8 @@
+ #define MAXOPT 100
+ #define CONFIG_GROUP "__CONFIG"
+
+-#define ICON_SOURCE "pixmaps/grsync.png"
+-#define ICON_SOURCE_BUSY "pixmaps/grsync-busy.png"
+-#define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE
+-#define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY
++#define ICON "grsync"
++#define ICON_BUSY "grsync-busy"
+
+ GtkBuilder *builder;
+ GtkWidget *main_window;
+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 2018-12-30 11:41:45.745911502 +0100
+@@ -68,9 +68,7 @@
+ cmdline_import = FALSE;
+ }
+
+- icon = g_file_test(ICON_SOURCE, G_FILE_TEST_EXISTS) ? ICON_SOURCE : ICON_PACKAGE;
+- icon_busy = g_file_test(ICON_SOURCE_BUSY, G_FILE_TEST_EXISTS) ? ICON_SOURCE_BUSY : ICON_PACKAGE_BUSY;
+- gtk_window_set_default_icon_from_file(icon, NULL);
++ gtk_window_set_default_icon_name(ICON);
+
+ builder = gtk_builder_new();
+ result = gtk_builder_add_from_file(builder, XMLFILE, &gerror) || gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/" PACKAGE "/" XMLFILE, NULL);
More information about the arch-commits
mailing list