From 399d81ee6199881564dd9c31c0d299af0ce83608 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:48 +0200 Subject: [PATCH 01/33] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- lxappearance.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lxappearance.spec b/lxappearance.spec index f856ee7..b3c2f6b 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -31,6 +31,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{vers # https://sourceforge.net/p/lxde/bugs/866/ Patch0: https://sourceforge.net/p/lxde/bugs/_discuss/thread/ecb5ef0c/9b37/attachment/lxappearance-0.6.3-icon-theme-init.patch +BuildRequires: gcc BuildRequires: pkgconfig(gtk+-2.0) > 2.6 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) From 365f05f22c73a2fc818a0f5f602fd26f821d4cea Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:52:35 -0500 Subject: [PATCH 02/33] Remove needless use of %defattr --- lxappearance.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index b3c2f6b..aef45c2 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -93,7 +93,6 @@ desktop-file-install \ %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS %license COPYING %{_bindir}/%{name} @@ -103,7 +102,6 @@ desktop-file-install \ %files devel -%defattr(-,root,root,-) %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc From b1a2ce799ad0f8ed307b2c6c7cef70221f6c93e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:34:13 +0000 Subject: [PATCH 03/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index aef45c2..6c33336 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,7 +16,7 @@ Name: lxappearance Version: 0.6.3 -Release: 6%{?git_version:.%{?git_version}}%{?dist} +Release: 7%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE Group: User Interface/Desktops @@ -107,6 +107,9 @@ desktop-file-install \ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.6.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 0.6.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From df862435d339ab5310e87d0aaf04710fe5113632 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:53 +0100 Subject: [PATCH 04/33] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- lxappearance.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index 6c33336..15542d9 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -19,7 +19,6 @@ Version: 0.6.3 Release: 7%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE -Group: User Interface/Desktops License: GPLv2+ URL: http://lxde.org/ #VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxappearance @@ -54,7 +53,6 @@ reload their themes. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel From 9a9d98cbcddee37843fde500f50afbdba470de07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 09:19:41 +0000 Subject: [PATCH 05/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 15542d9..60a004e 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,7 +16,7 @@ Name: lxappearance Version: 0.6.3 -Release: 7%{?git_version:.%{?git_version}}%{?dist} +Release: 8%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -105,6 +105,9 @@ desktop-file-install \ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.6.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.6.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a0599fe7bc35116bbb6fbff7f035e67500a38bca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:32:37 +0000 Subject: [PATCH 06/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 60a004e..07d865a 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,7 +16,7 @@ Name: lxappearance Version: 0.6.3 -Release: 8%{?git_version:.%{?git_version}}%{?dist} +Release: 9%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -105,6 +105,9 @@ desktop-file-install \ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.6.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d8c11ba8add81f820b13e8e6f513635e0c1de218 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:40:20 +0000 Subject: [PATCH 07/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 07d865a..d11621e 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,7 +16,7 @@ Name: lxappearance Version: 0.6.3 -Release: 9%{?git_version:.%{?git_version}}%{?dist} +Release: 10%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -105,6 +105,9 @@ desktop-file-install \ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.6.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.6.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6c3c43f3b8067b4902304e7466e35941474b62e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:35:42 +0000 Subject: [PATCH 08/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index d11621e..e39667b 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,7 +16,7 @@ Name: lxappearance Version: 0.6.3 -Release: 10%{?git_version:.%{?git_version}}%{?dist} +Release: 11%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -105,6 +105,9 @@ desktop-file-install \ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.6.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.6.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 1c9f0fba25ea594fc6aeb79dac7034af5a7a26ee Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 21:11:43 +0000 Subject: [PATCH 09/33] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- lxappearance.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lxappearance.spec b/lxappearance.spec index e39667b..87972b4 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -30,6 +30,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{vers # https://sourceforge.net/p/lxde/bugs/866/ Patch0: https://sourceforge.net/p/lxde/bugs/_discuss/thread/ecb5ef0c/9b37/attachment/lxappearance-0.6.3-icon-theme-init.patch +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(gtk+-2.0) > 2.6 BuildRequires: pkgconfig(dbus-1) From 5578c8889aa18b6cb477e912f100cd7c92f083ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:58:47 +0000 Subject: [PATCH 10/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 87972b4..8bb7cb7 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,7 +16,7 @@ Name: lxappearance Version: 0.6.3 -Release: 11%{?git_version:.%{?git_version}}%{?dist} +Release: 12%{?git_version:.%{?git_version}}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -106,6 +106,9 @@ desktop-file-install \ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.6.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e4700becc070c3b7240b0650ebbe5432fc843084 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Mar 2021 22:27:25 +0900 Subject: [PATCH 11/33] Update to the latest git Fix segfault with GLib 2.68 Fix segfault when removing icon theme --- .gitignore | 1 + ..._from_dir-never-reuse-GKeyFile-objec.patch | 91 ++++++++++++ ...clicked-initialize-both-variable-cor.patch | 35 +++++ lxappearance-0.6.3-icon-theme-init.patch | 18 --- lxappearance.spec | 139 ++++++++++++++---- sources | 2 +- 6 files changed, 235 insertions(+), 51 deletions(-) create mode 100644 lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch create mode 100644 lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch delete mode 100644 lxappearance-0.6.3-icon-theme-init.patch diff --git a/.gitignore b/.gitignore index bdc259d..4deb7b3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ lxappearance-0.4.0.tar.gz /lxappearance-0.6.1.tar.xz /lxappearance-0.6.2.tar.xz /lxappearance-0.6.3.tar.xz +/lxappearance-20210321T2042.tar.gz diff --git a/lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch b/lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch new file mode 100644 index 0000000..cd8b2b1 --- /dev/null +++ b/lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch @@ -0,0 +1,91 @@ +From 2aa35e4c8a9d9c632e411df83d43ec27f4ddf718 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sun, 21 Mar 2021 21:52:10 +0900 +Subject: [PATCH 1/2] load_icon_themes_from_dir: never reuse GKeyFile object + +As written on: +https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html#g-key-file-load-from-file +an empty GKeyFile object must be passed to g_key_file_load_from_file . +--- + src/icon-theme.c | 8 ++++---- + src/icon-theme.h | 2 +- + src/utils.c | 4 +--- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/icon-theme.c b/src/icon-theme.c +index 7fba616..ea1db83 100644 +--- a/src/icon-theme.c ++++ b/src/icon-theme.c +@@ -46,7 +46,7 @@ static void icon_theme_free(IconTheme* theme) + g_slice_free(IconTheme, theme); + } + +-void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKeyFile* kf) ++void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir) + { + /* NOTE: + * 1. theoratically, base_dir is identical to theme_dir +@@ -75,6 +75,7 @@ void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKey + IconTheme* theme = g_slice_new0(IconTheme); + char* index_theme; + char* cursor_subdir; ++ GKeyFile* kf = g_key_file_new(); + + theme->name = g_strdup(name); + index_theme = g_build_filename(theme_dir, name, "index.theme", NULL); +@@ -97,6 +98,7 @@ void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKey + else + theme->disp_name = theme->name; + g_free(index_theme); ++ g_key_file_free(kf); + + cursor_subdir = g_build_filename(theme_dir, name, "cursors", NULL); + /* it contains a cursor theme */ +@@ -119,13 +121,11 @@ static void load_icon_themes() + { + int n, i; + gtk_icon_theme_get_search_path(gtk_icon_theme_get_default(), &icon_theme_dirs, &n); +- GKeyFile* kf = g_key_file_new(); + for(i = 0; i < n; ++i) + { +- load_icon_themes_from_dir(icon_theme_dirs[i], icon_theme_dirs[i], kf); ++ load_icon_themes_from_dir(icon_theme_dirs[i], icon_theme_dirs[i]); + /* g_debug("icon_theme_dirs[%d] = %s", i, icon_theme_dirs[i]); */ + } +- g_key_file_free(kf); + } + + +diff --git a/src/icon-theme.h b/src/icon-theme.h +index 7ba2ac1..45a104d 100644 +--- a/src/icon-theme.h ++++ b/src/icon-theme.h +@@ -40,7 +40,7 @@ typedef struct + }IconTheme; + + void icon_theme_init(GtkBuilder* b); +-void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKeyFile* kf); ++void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir); + + gint icon_theme_cmp_name(IconTheme* t, const char* name); + gint icon_theme_cmp_disp_name(IconTheme* t1, IconTheme* t2); +diff --git a/src/utils.c b/src/utils.c +index 09d356d..4f3af10 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -159,11 +159,9 @@ _failed: + { + /* move files in tmp_dir to user_icons_dir */ + GDir* dir; +- GKeyFile* kf = g_key_file_new(); + + /* convert the themes in the dir to IconTheme structs and add them to app.icon_themes list */ +- load_icon_themes_from_dir(user_icons_dir, tmp_dir, kf); +- g_key_file_free(kf); ++ load_icon_themes_from_dir(user_icons_dir, tmp_dir); + + /* now really move this themes to $XDG_DATA_HOME/icons dir and also update the GUI */ + dir = g_dir_open(tmp_dir, 0, NULL); +-- +2.30.2 + diff --git a/lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch b/lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch new file mode 100644 index 0000000..7c35777 --- /dev/null +++ b/lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch @@ -0,0 +1,35 @@ +From 3f50631f17f96ef3695921b892eb2f7b82a2b43d Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sun, 21 Mar 2021 22:08:16 +0900 +Subject: [PATCH 2/2] on_remove_theme_clicked: initialize both variable + correctly + +In on_remove_theme_clicked: both variable is used uninitialized, which causes lxappearance segfault +when removing theme. Initialize this correctly. +--- + src/icon-theme.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/icon-theme.c b/src/icon-theme.c +index ea1db83..6952cd8 100644 +--- a/src/icon-theme.c ++++ b/src/icon-theme.c +@@ -171,7 +171,6 @@ static void on_remove_theme_clicked(GtkButton* btn, gpointer user_data) + if(gtk_tree_selection_get_selected(sel, &model, &it)) + { + IconTheme* theme; +- gboolean both = theme->has_icon && theme->has_cursor; + + if(gtk_tree_model_iter_n_children(model, NULL) < 2) + { +@@ -183,6 +182,7 @@ static void on_remove_theme_clicked(GtkButton* btn, gpointer user_data) + gtk_tree_model_get(model, &it, 1, &theme, -1); + if(remove_icon_theme(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(btn))), theme)) + { ++ gboolean both = theme->has_icon && theme->has_cursor; + gtk_list_store_remove(GTK_LIST_STORE(model), &it); + + /* select the first theme */ +-- +2.30.2 + diff --git a/lxappearance-0.6.3-icon-theme-init.patch b/lxappearance-0.6.3-icon-theme-init.patch deleted file mode 100644 index c2ffca4..0000000 --- a/lxappearance-0.6.3-icon-theme-init.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- lxappearance-0.6.3/src/icon-theme.c.init 2016-02-21 07:48:38.000000000 +0900 -+++ lxappearance-0.6.3/src/icon-theme.c 2017-03-16 14:34:45.543111563 +0900 -@@ -171,7 +171,6 @@ - if(gtk_tree_selection_get_selected(sel, &model, &it)) - { - IconTheme* theme; -- gboolean both = theme->has_icon && theme->has_cursor; - - if(gtk_tree_model_iter_n_children(model, NULL) < 2) - { -@@ -190,6 +189,7 @@ - gtk_tree_selection_select_iter(sel, &it); - - /* FIXME: in rare case, a theme can contain both icons and cursors */ -+ gboolean both = theme->has_icon && theme->has_cursor; - if(both) /* we need to remove item in another list store, too */ - { - model = GTK_TREE_MODEL(model == (GtkTreeModel*)app.icon_theme_store ? app.cursor_theme_store : app.icon_theme_store); diff --git a/lxappearance.spec b/lxappearance.spec index 8bb7cb7..46655d5 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -1,46 +1,74 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=442269 -%global git_snapshot 0 +%global use_release 0 +%global use_git 0 +%global use_gitbare 1 -%if 0%{?git_snapshot} -%global git_rev f0945814186b2903c9899e8d91e640e3341fd2b9 -%global git_date 20100903 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version %{git_date}git%{git_short} +%if 0%{?use_git} < 1 +%if 0%{?use_gitbare} < 1 +# force +%global use_release 1 +%endif %endif -# Source0 was generated as follows: -# git clone git://lxde.git.sourceforge.net/gitroot/lxde/%{name} -# cd %{name} -# git archive --format=tar --prefix=%{name}/ %{git_short} | bzip2 > %{name}-%{?git_version}.tar.bz2 +%if 0%{?use_gitbare} +%global gittardate 20210321 +%global gittartime 2042 +%global gitbaredate 20200807 +%global git_rev d132fdd829b1ed080f4c82a53b71d7e88dda8cc2 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version D%{gitbaredate}git%{git_short} +%endif + +%global mainrel 13 + +%if 0%{?use_release} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%endif +%if 0%{?use_gitbare} >= 1 +%global fedorarel %{mainrel}.%{git_version} +%endif Name: lxappearance Version: 0.6.3 -Release: 12%{?git_version:.%{?git_version}}%{?dist} +Release: %{fedorarel}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ URL: http://lxde.org/ #VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxappearance -%if 0%{?git_snapshot} -Source0: %{name}-%{?git_version}.tar.bz2 -%else +%if 0%{?use_gitbare} +Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz +%endif +%if 0%{?use_git} +Source0: %{name}-%{version}-%{?git_version}.tar.bz2 +%endif +%if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif +# https://github.com/lxde/lxappearance/pull/3 +Patch1: lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch # https://sourceforge.net/p/lxde/bugs/866/ -Patch0: https://sourceforge.net/p/lxde/bugs/_discuss/thread/ecb5ef0c/9b37/attachment/lxappearance-0.6.3-icon-theme-init.patch +# https://github.com/lxde/lxappearance/pull/4 +Patch2: lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc -BuildRequires: pkgconfig(gtk+-2.0) > 2.6 -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(libmenu-cache) +BuildRequires: pkgconfig(glib-2.0) >= 2.26.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.12.0 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libmenu-cache) >= 0.3.2 BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool BuildRequires: docbook-utils BuildRequires: docbook-style-xsl +BuildRequires: %{_bindir}/xsltproc + +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: %{_bindir}/git + Requires: lxsession >= 0.4.0 %description @@ -62,35 +90,78 @@ for LXAppearance. %prep -%setup -q %{?git_version:-n %{name}} -%patch0 -p1 -b .init +%if 0%{?use_release} +%setup -q + +git init +%endif + +%if 0%{?use_gitbare} +%setup -q -c -T -a 0 +git clone ./%{name}.git/ +cd %{name} + +#git checkout -b %{version}-fedora %{version} +git checkout -b %{version}-fedora %{git_rev} +cp -a [A-Z]* .. +cp -a data/ .. + +cat > GITHASH < - 0.6.3-13.D20200807gitd132fdd8 +- Update to the latest git +- Fix segfault with GLib 2.68 +- Fix segfault when removing icon theme + * Tue Jan 26 2021 Fedora Release Engineering - 0.6.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a627946..1063dd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-0.6.3.tar.xz) = 035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c +SHA512 (lxappearance-20210321T2042.tar.gz) = 6e4ffab43923fa803c0be130c5690c567a376ee20342371f22a3a408ba9ee678ea851d6598f296d9ad5552d922bb4ca1492ce04ff6e584267d38cbf6ef4595d9 From 92c4b77628431b7c6ccc7e7024703eba9e7e299f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:27:40 +0000 Subject: [PATCH 12/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 46655d5..61a6808 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -31,7 +31,7 @@ Name: lxappearance Version: 0.6.3 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{?dist}.1 Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -176,6 +176,9 @@ popd %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Mar 21 2021 Mamoru TASAKA - 0.6.3-13.D20200807gitd132fdd8 - Update to the latest git - Fix segfault with GLib 2.68 From d0000e1c349212a1372589722b7e9ed42efde5cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:24:01 +0000 Subject: [PATCH 13/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 61a6808..19574f3 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -31,7 +31,7 @@ Name: lxappearance Version: 0.6.3 -Release: %{fedorarel}%{?dist}.1 +Release: %{fedorarel}%{?dist}.2 Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -176,6 +176,9 @@ popd %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From cbedb6aaf0aa9f3b4059dab80b1db663e9927fd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:12:14 +0000 Subject: [PATCH 14/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 19574f3..ff2703c 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -31,7 +31,7 @@ Name: lxappearance Version: 0.6.3 -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -176,6 +176,9 @@ popd %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ee0808127ef9d9173b575ed0be5718726a3cd52e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:38:16 +0000 Subject: [PATCH 15/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index ff2703c..3b40c0f 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -31,7 +31,7 @@ Name: lxappearance Version: 0.6.3 -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist}.4 Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ @@ -176,6 +176,9 @@ popd %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6b98da77336951621c3b42930ef386c4b4146638 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:13:34 +0900 Subject: [PATCH 16/33] rename release macro to make rpmdev-bumprelease work --- lxappearance.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index 3b40c0f..b357bcf 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -23,15 +23,15 @@ %global mainrel 13 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif Name: lxappearance Version: 0.6.3 -Release: %{fedorarel}%{?dist}.4 +Release: %{baserelease}%{?dist}.4 Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ From b9175b91c73c3b4fb94b84081553b797f6e2da7e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:19:42 +0900 Subject: [PATCH 17/33] fix baserelease usage --- lxappearance.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index b357bcf..dcd49a9 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -20,18 +20,18 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global mainrel 13 +%global baserelease 13 %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif Name: lxappearance Version: 0.6.3 -Release: %{baserelease}%{?dist}.4 +Release: %{fedorarel}%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE License: GPLv2+ From 915ba0add4a131cc8e18ab0564c532fe3b195ef0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:25:02 +0000 Subject: [PATCH 18/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index dcd49a9..fee3442 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -20,7 +20,7 @@ %global git_version D%{gitbaredate}git%{git_short} %endif -%global baserelease 13 +%global baserelease 14 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -176,6 +176,9 @@ popd %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.6.3-14.D20200807gitd132fdd8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.6.3-13.D20200807gitd132fdd8.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6aa96b93ad4ff9d1953ed1679f914b8d19682a34 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 14:21:38 +0900 Subject: [PATCH 19/33] indentation etc --- .gitignore | 11 ++---- lxappearance.spec | 88 ++++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 4deb7b3..44e4e80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ -lxappearance-0.4.0.tar.gz -/lxappearance-20100903gitf0945814.tar.bz2 -/lxappearance-0.5.0.tar.gz -/lxappearance-0.5.1.tar.gz -/lxappearance-0.5.2.tar.gz -/lxappearance-0.6.1.tar.xz -/lxappearance-0.6.2.tar.xz -/lxappearance-0.6.3.tar.xz -/lxappearance-20210321T2042.tar.gz +/lxappearance-*.tar.xz +/lxappearance-*.tar.gz diff --git a/lxappearance.spec b/lxappearance.spec index fee3442..6e8801e 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -1,50 +1,55 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=442269 -%global use_release 0 -%global use_git 0 -%global use_gitbare 1 +%global use_release 0 +%global use_git 0 +%global use_gitbare 1 %if 0%{?use_git} < 1 %if 0%{?use_gitbare} < 1 # force -%global use_release 1 +%global use_release 1 %endif %endif +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} + %if 0%{?use_gitbare} -%global gittardate 20210321 -%global gittartime 2042 -%global gitbaredate 20200807 -%global git_rev d132fdd829b1ed080f4c82a53b71d7e88dda8cc2 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{gitbaredate}git%{git_short} +%global gittardate 20210321 +%global gittartime 2042 + +%global gitbaredate 20200807 +%global git_rev d132fdd829b1ed080f4c82a53b71d7e88dda8cc2 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} %endif -%global baserelease 14 - -%if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif -%if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} -%endif -Name: lxappearance -Version: 0.6.3 -Release: %{fedorarel}%{?dist} -Summary: Feature-rich GTK+ theme switcher for LXDE +%if 0%{?use_git} || 0%{?use_gitbare} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} +%endif -License: GPLv2+ -URL: http://lxde.org/ -#VCS: git:git://lxde.git.sourceforge.net/gitroot/lxde/lxappearance + +%global main_version 0.6.3 + +Name: lxappearance +Version: %{main_version}%{git_ver_rpm} +Release: 1%{?dist} +Summary: Feature-rich GTK+ theme switcher for LXDE + +# SPDX confirmed +License: GPL-2.0-or-later +URL: http://lxde.org/ %if 0%{?use_gitbare} -Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz +Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif %if 0%{?use_git} -Source0: %{name}-%{version}-%{?git_version}.tar.bz2 +Source0: %{name}-%{main_version}-%{?git_version}.tar.bz2 %endif %if 0%{?use_release} -Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz +Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_version}.tar.xz %endif # https://github.com/lxde/lxappearance/pull/3 Patch1: lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch @@ -67,7 +72,7 @@ BuildRequires: %{_bindir}/xsltproc BuildRequires: automake BuildRequires: autoconf -BuildRequires: %{_bindir}/git +BuildRequires: /usr/bin/git Requires: lxsession >= 0.4.0 @@ -91,18 +96,18 @@ for LXAppearance. %prep %if 0%{?use_release} -%setup -q +%setup -q -n %{name}-%{main_version}%{git_builddir} git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 git clone ./%{name}.git/ cd %{name} #git checkout -b %{version}-fedora %{version} -git checkout -b %{version}-fedora %{git_rev} +git checkout -b %{main_version}-fedora %{git_rev} cp -a [A-Z]* .. cp -a data/ .. @@ -111,14 +116,14 @@ EOF cat GITHASH | while read line do - commit=$(echo "$line" | sed -e 's|[ \t].*||') - git cherry-pick $commit + commit=$(echo "$line" | sed -e 's|[ \t].*||') + git cherry-pick $commit done %endif git config user.name "lxpanel Fedora maintainer" -git config user.email "lxpanel-owner@fedoraproject.org" +git config user.email "lxpanel-maintainers@fedoraproject.org" %if 0%{?use_release} git add . @@ -148,23 +153,20 @@ pushd %{name} pushd %{name} %endif -rm -rf %{buildroot} %make_install -desktop-file-install \ - --delete-original \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}.desktop - %if 0%{?use_gitbare} popd %endif %find_lang %{name} +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + %files -f %{name}.lang -%doc AUTHORS -%license COPYING +%doc AUTHORS +%license COPYING %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop %{_datadir}/%{name}/ From f3945e0cbb0702d1c0d5c5eb608796f46f619855 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 14:37:11 +0900 Subject: [PATCH 20/33] Update to the latest git --- create-lxappearance-git-bare-tarball.sh | 28 +++++++++++++++++++ lxappearance.spec | 36 ++++++++++++++----------- sources | 2 +- 3 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 create-lxappearance-git-bare-tarball.sh diff --git a/create-lxappearance-git-bare-tarball.sh b/create-lxappearance-git-bare-tarball.sh new file mode 100644 index 0000000..1309606 --- /dev/null +++ b/create-lxappearance-git-bare-tarball.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=lxappearance +GITURL=https://github.com/lxde/${REPONAME}.git + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/libfm-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL + +pushd ${REPONAME}.git/ +git log --format=fuller | head -n 12 +popd + +tar czf ${TARNAME} ${REPONAME}.git/ + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/lxappearance.spec b/lxappearance.spec index 6e8801e..10d2698 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,11 +16,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20210321 -%global gittartime 2042 +%global gittardate 20230814 +%global gittartime 1421 -%global gitbaredate 20200807 -%global git_rev d132fdd829b1ed080f4c82a53b71d7e88dda8cc2 +%global gitbaredate 20230801 +%global git_rev 8e634d03ac8f499358bfc09435b065d6b7060a96 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -51,11 +51,6 @@ Source0: %{name}-%{main_version}-%{?git_version}.tar.bz2 %if 0%{?use_release} Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_version}.tar.xz %endif -# https://github.com/lxde/lxappearance/pull/3 -Patch1: lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch -# https://sourceforge.net/p/lxde/bugs/866/ -# https://github.com/lxde/lxappearance/pull/4 -Patch2: lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch BuildRequires: make BuildRequires: gcc @@ -68,7 +63,7 @@ BuildRequires: gettext BuildRequires: intltool BuildRequires: docbook-utils BuildRequires: docbook-style-xsl -BuildRequires: %{_bindir}/xsltproc +BuildRequires: /usr/bin/xsltproc BuildRequires: automake BuildRequires: autoconf @@ -130,8 +125,9 @@ git add . git commit -m "base" -q %endif -cat %PATCH1 | git am -cat %PATCH2 | git am +# For GTK-2 compilation, workaround +sed -i src/lxappearance.c \ + -e 's|GDK_IS_X11_DISPLAY|GDK_IS_DISPLAY|' sh autogen.sh @@ -144,6 +140,9 @@ pushd %{name} %configure \ --disable-silent-rules \ --enable-man \ +%if 0 + --enable-gtk3 \ +%endif %{nil} %make_build @@ -164,20 +163,25 @@ popd %check desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop -%files -f %{name}.lang -%doc AUTHORS +%files -f %{name}.lang +%doc AUTHORS %license COPYING + %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop -%{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/ui/ %{_mandir}/man1/%{name}*.1.* -%files devel +%files devel %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Aug 14 2023 Mamoru TASAKA - 0.6.3^20230801git8e634d03-1 +- Update to the latest git + * Thu Jul 20 2023 Fedora Release Engineering - 0.6.3-14.D20200807gitd132fdd8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 1063dd7..041a825 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-20210321T2042.tar.gz) = 6e4ffab43923fa803c0be130c5690c567a376ee20342371f22a3a408ba9ee678ea851d6598f296d9ad5552d922bb4ca1492ce04ff6e584267d38cbf6ef4595d9 +SHA512 (lxappearance-20230814T1421.tar.gz) = 2ece2395715d787b7719b727eccac33d76b85ecd0835b5f40bf6dcd96081aa19b254d37ea9d468fad5a8201ae1ca081da2e6183d25b37beea0845cc5496e97be From e37fb2a927ad4d204b7ed1c0975b09b39bf4fc8d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Aug 2023 14:37:59 +0900 Subject: [PATCH 21/33] remove unneeded patches --- ..._from_dir-never-reuse-GKeyFile-objec.patch | 91 ------------------- ...clicked-initialize-both-variable-cor.patch | 35 ------- 2 files changed, 126 deletions(-) delete mode 100644 lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch delete mode 100644 lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch diff --git a/lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch b/lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch deleted file mode 100644 index cd8b2b1..0000000 --- a/lxappearance-0.6.3-0001-load_icon_themes_from_dir-never-reuse-GKeyFile-objec.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 2aa35e4c8a9d9c632e411df83d43ec27f4ddf718 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sun, 21 Mar 2021 21:52:10 +0900 -Subject: [PATCH 1/2] load_icon_themes_from_dir: never reuse GKeyFile object - -As written on: -https://developer.gnome.org/glib/stable/glib-Key-value-file-parser.html#g-key-file-load-from-file -an empty GKeyFile object must be passed to g_key_file_load_from_file . ---- - src/icon-theme.c | 8 ++++---- - src/icon-theme.h | 2 +- - src/utils.c | 4 +--- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/src/icon-theme.c b/src/icon-theme.c -index 7fba616..ea1db83 100644 ---- a/src/icon-theme.c -+++ b/src/icon-theme.c -@@ -46,7 +46,7 @@ static void icon_theme_free(IconTheme* theme) - g_slice_free(IconTheme, theme); - } - --void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKeyFile* kf) -+void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir) - { - /* NOTE: - * 1. theoratically, base_dir is identical to theme_dir -@@ -75,6 +75,7 @@ void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKey - IconTheme* theme = g_slice_new0(IconTheme); - char* index_theme; - char* cursor_subdir; -+ GKeyFile* kf = g_key_file_new(); - - theme->name = g_strdup(name); - index_theme = g_build_filename(theme_dir, name, "index.theme", NULL); -@@ -97,6 +98,7 @@ void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKey - else - theme->disp_name = theme->name; - g_free(index_theme); -+ g_key_file_free(kf); - - cursor_subdir = g_build_filename(theme_dir, name, "cursors", NULL); - /* it contains a cursor theme */ -@@ -119,13 +121,11 @@ static void load_icon_themes() - { - int n, i; - gtk_icon_theme_get_search_path(gtk_icon_theme_get_default(), &icon_theme_dirs, &n); -- GKeyFile* kf = g_key_file_new(); - for(i = 0; i < n; ++i) - { -- load_icon_themes_from_dir(icon_theme_dirs[i], icon_theme_dirs[i], kf); -+ load_icon_themes_from_dir(icon_theme_dirs[i], icon_theme_dirs[i]); - /* g_debug("icon_theme_dirs[%d] = %s", i, icon_theme_dirs[i]); */ - } -- g_key_file_free(kf); - } - - -diff --git a/src/icon-theme.h b/src/icon-theme.h -index 7ba2ac1..45a104d 100644 ---- a/src/icon-theme.h -+++ b/src/icon-theme.h -@@ -40,7 +40,7 @@ typedef struct - }IconTheme; - - void icon_theme_init(GtkBuilder* b); --void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir, GKeyFile* kf); -+void load_icon_themes_from_dir(const char* base_dir, const char* theme_dir); - - gint icon_theme_cmp_name(IconTheme* t, const char* name); - gint icon_theme_cmp_disp_name(IconTheme* t1, IconTheme* t2); -diff --git a/src/utils.c b/src/utils.c -index 09d356d..4f3af10 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -159,11 +159,9 @@ _failed: - { - /* move files in tmp_dir to user_icons_dir */ - GDir* dir; -- GKeyFile* kf = g_key_file_new(); - - /* convert the themes in the dir to IconTheme structs and add them to app.icon_themes list */ -- load_icon_themes_from_dir(user_icons_dir, tmp_dir, kf); -- g_key_file_free(kf); -+ load_icon_themes_from_dir(user_icons_dir, tmp_dir); - - /* now really move this themes to $XDG_DATA_HOME/icons dir and also update the GUI */ - dir = g_dir_open(tmp_dir, 0, NULL); --- -2.30.2 - diff --git a/lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch b/lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch deleted file mode 100644 index 7c35777..0000000 --- a/lxappearance-0.6.3-0002-on_remove_theme_clicked-initialize-both-variable-cor.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3f50631f17f96ef3695921b892eb2f7b82a2b43d Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Sun, 21 Mar 2021 22:08:16 +0900 -Subject: [PATCH 2/2] on_remove_theme_clicked: initialize both variable - correctly - -In on_remove_theme_clicked: both variable is used uninitialized, which causes lxappearance segfault -when removing theme. Initialize this correctly. ---- - src/icon-theme.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/icon-theme.c b/src/icon-theme.c -index ea1db83..6952cd8 100644 ---- a/src/icon-theme.c -+++ b/src/icon-theme.c -@@ -171,7 +171,6 @@ static void on_remove_theme_clicked(GtkButton* btn, gpointer user_data) - if(gtk_tree_selection_get_selected(sel, &model, &it)) - { - IconTheme* theme; -- gboolean both = theme->has_icon && theme->has_cursor; - - if(gtk_tree_model_iter_n_children(model, NULL) < 2) - { -@@ -183,6 +182,7 @@ static void on_remove_theme_clicked(GtkButton* btn, gpointer user_data) - gtk_tree_model_get(model, &it, 1, &theme, -1); - if(remove_icon_theme(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(btn))), theme)) - { -+ gboolean both = theme->has_icon && theme->has_cursor; - gtk_list_store_remove(GTK_LIST_STORE(model), &it); - - /* select the first theme */ --- -2.30.2 - From 21bddb43359df26beb1f4d3219be9e77e6681798 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Sep 2023 12:30:35 +0900 Subject: [PATCH 22/33] Update to the latest git --- lxappearance.spec | 15 +++++++-------- sources | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index 10d2698..70f5263 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,11 +16,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20230814 -%global gittartime 1421 +%global gittardate 20230915 +%global gittartime 1222 -%global gitbaredate 20230801 -%global git_rev 8e634d03ac8f499358bfc09435b065d6b7060a96 +%global gitbaredate 20230913 +%global git_rev 5423cc46ce738ad8b01818957e0393811225681d %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -125,10 +125,6 @@ git add . git commit -m "base" -q %endif -# For GTK-2 compilation, workaround -sed -i src/lxappearance.c \ - -e 's|GDK_IS_X11_DISPLAY|GDK_IS_DISPLAY|' - sh autogen.sh @@ -179,6 +175,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Sep 15 2023 Mamoru TASAKA - 0.6.3^20230913git5423cc46-1 +- Update to the latest git + * Mon Aug 14 2023 Mamoru TASAKA - 0.6.3^20230801git8e634d03-1 - Update to the latest git diff --git a/sources b/sources index 041a825..9d1be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-20230814T1421.tar.gz) = 2ece2395715d787b7719b727eccac33d76b85ecd0835b5f40bf6dcd96081aa19b254d37ea9d468fad5a8201ae1ca081da2e6183d25b37beea0845cc5496e97be +SHA512 (lxappearance-20230915T1222.tar.gz) = d512180a0d6ef21470e8e4462a8ccd40057fa18135108f14fa8813a5f06832ed5dbcbbd0dc5ba3fce180bea48e5c9c47697642c331500f93d2122e2b94c7fd04 From 786201bb316fde097e9826b74a4cb0588642f27c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Dec 2023 11:36:01 +0900 Subject: [PATCH 23/33] Update to the latest git --- lxappearance.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index 70f5263..aea334f 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,11 +16,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20230915 -%global gittartime 1222 +%global gittardate 20231231 +%global gittartime 1128 -%global gitbaredate 20230913 -%global git_rev 5423cc46ce738ad8b01818957e0393811225681d +%global gitbaredate 20230917 +%global git_rev 655fd083a98e7b11d61119bdf0d97aae6c774780 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -175,6 +175,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sun Dec 31 2023 Mamoru TASAKA - 0.6.3^20230917git655fd083-1 +- Update to the latest git + * Fri Sep 15 2023 Mamoru TASAKA - 0.6.3^20230913git5423cc46-1 - Update to the latest git diff --git a/sources b/sources index 9d1be31..4cbcd93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-20230915T1222.tar.gz) = d512180a0d6ef21470e8e4462a8ccd40057fa18135108f14fa8813a5f06832ed5dbcbbd0dc5ba3fce180bea48e5c9c47697642c331500f93d2122e2b94c7fd04 +SHA512 (lxappearance-20231231T1128.tar.gz) = 275f7ee311f7c8c43c77336178784eb76d5a8ca48b795df950ea75e608c2a057ac911b7a8ab4060c0eb978544d2fdbc13dcc60138d6d1a48c1780eab45c71a42 From a219c24001d20eb0adadbcee61fce7a787430e91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:34:55 +0000 Subject: [PATCH 24/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index aea334f..f08e4b0 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -175,6 +175,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.6.3^20230917git655fd083-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Dec 31 2023 Mamoru TASAKA - 0.6.3^20230917git655fd083-1 - Update to the latest git From ea5aaa427b075ee65047df7455eac6a12ee85be4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:22:00 +0000 Subject: [PATCH 25/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index f08e4b0..f4d95db 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -175,6 +175,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.6.3^20230917git655fd083-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.6.3^20230917git655fd083-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f4706a3e67d93c62abb854b9e0e00e7134481d47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:23:14 +0000 Subject: [PATCH 26/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index f4d95db..0dc6ecc 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -175,6 +175,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.6.3^20230917git655fd083-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.6.3^20230917git655fd083-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4acd5a6c3564a08216b81e5a38dd438b85c500b4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Aug 2024 17:18:46 +0900 Subject: [PATCH 27/33] Update to the latest git Update to the latest git --- lxappearance.spec | 25 ++++++++++++++++++++----- sources | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index 0dc6ecc..0639b4c 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,11 +16,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20231231 -%global gittartime 1128 +%global gittardate 20240825 +%global gittartime 1714 -%global gitbaredate 20230917 -%global git_rev 655fd083a98e7b11d61119bdf0d97aae6c774780 +%global gitbaredate 20240817 +%global git_rev 95d5b02e901b0bf33c5ab037a88b8c054a3f818f %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -103,6 +103,18 @@ cd %{name} #git checkout -b %{version}-fedora %{version} git checkout -b %{main_version}-fedora %{git_rev} + +# Restore timestamps +set +x +echo "Restore timestamps" +git ls-tree -r --name-only HEAD | while read f +do + unixtime=$(git log -n 1 --pretty='%ct' -- $f) + touch -d "@${unixtime}" $f +done +set -x + + cp -a [A-Z]* .. cp -a data/ .. @@ -175,6 +187,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sun Aug 25 2024 Mamoru TASAKA - 0.6.3^20240817git95d5b02e-1 +- Update to the latest git + * Thu Jul 18 2024 Fedora Release Engineering - 0.6.3^20230917git655fd083-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 4cbcd93..6342fb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-20231231T1128.tar.gz) = 275f7ee311f7c8c43c77336178784eb76d5a8ca48b795df950ea75e608c2a057ac911b7a8ab4060c0eb978544d2fdbc13dcc60138d6d1a48c1780eab45c71a42 +SHA512 (lxappearance-20240825T1714.tar.gz) = ae1639d6083a38a852f21c54ef51adebe865afce9844756d25aa3bddef903e3272e6f449dcd1e4096b96e25103bd0f418f760336c00dded114ef7ed21ec86f5b From 118bd893498b7d77194d861865646da7e07ab316 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 30 Aug 2024 14:40:17 +0900 Subject: [PATCH 28/33] Own plugin directory Own plugin directory --- lxappearance.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 0639b4c..9486785 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -166,6 +166,9 @@ pushd %{name} popd %endif +# Own plugin directory +mkdir -p %{buildroot}%{_libdir}/%{name}/plugins/ + %find_lang %{name} %check @@ -179,6 +182,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/*%{name}.desktop %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/ui/ +%dir %{_libdir}/%{name}/plugins/ %{_mandir}/man1/%{name}*.1.* %files devel @@ -187,6 +191,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Aug 30 2024 Mamoru TASAKA - 0.6.3^20240817git95d5b02e-2 +- Own plugin directory + * Sun Aug 25 2024 Mamoru TASAKA - 0.6.3^20240817git95d5b02e-1 - Update to the latest git From 47257483a96e60bb59e3af70ca2609e46ceca8fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:28:38 +0000 Subject: [PATCH 29/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index 9486785..024e4bb 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -191,6 +191,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.6.3^20240817git95d5b02e-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Aug 30 2024 Mamoru TASAKA - 0.6.3^20240817git95d5b02e-2 - Own plugin directory From 2d43d81b951a06c5e7db6f7b188249348cd61ae5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 11 Feb 2025 15:45:15 +0900 Subject: [PATCH 30/33] update to the latest git --- lxappearance.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index 024e4bb..ab838c9 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,11 +16,11 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20240825 -%global gittartime 1714 +%global gittardate 20250211 +%global gittartime 1538 -%global gitbaredate 20240817 -%global git_rev 95d5b02e901b0bf33c5ab037a88b8c054a3f818f +%global gitbaredate 20241025 +%global git_rev b51af4c5bb1eb4393847ea883c05af3c6bec9b26 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif @@ -36,7 +36,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -191,6 +191,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Tue Feb 11 2025 Mamoru TASAKA - 0.6.3^20241025gitb51af4c5-1 +- Update to the latest git + * Fri Jan 17 2025 Fedora Release Engineering - 0.6.3^20240817git95d5b02e-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6342fb4..367a0a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-20240825T1714.tar.gz) = ae1639d6083a38a852f21c54ef51adebe865afce9844756d25aa3bddef903e3272e6f449dcd1e4096b96e25103bd0f418f760336c00dded114ef7ed21ec86f5b +SHA512 (lxappearance-20250211T1538.tar.gz) = 79eabb5b1df18792d9cec9db36f812d48494b10646ee92ae411eea2addec9c5962d2f3627e5222ba997dbdd680f1616cec838c24adc7f99f5b163c536a3304b3 From 8e29ac017e538678202a71cfda0605d062b9262d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 25 Mar 2025 16:36:57 +0900 Subject: [PATCH 31/33] 0.6.4 --- lxappearance.spec | 16 ++++++++++------ sources | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lxappearance.spec b/lxappearance.spec index ab838c9..f2c795f 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -16,23 +16,24 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20250211 -%global gittartime 1538 +%global gittardate 20250325 +%global gittartime 1621 +%define use_gitcommit_as_rel 0 -%global gitbaredate 20241025 -%global git_rev b51af4c5bb1eb4393847ea883c05af3c6bec9b26 +%global gitbaredate 20250324 +%global git_rev 96e09b05b1897bdca72d8fdfeb1bd8ec68942c42 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif -%if 0%{?use_git} || 0%{?use_gitbare} +%if 0%{?use_gitcommit_as_rel} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif -%global main_version 0.6.3 +%global main_version 0.6.4 Name: lxappearance Version: %{main_version}%{git_ver_rpm} @@ -191,6 +192,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Tue Mar 25 2025 Mamoru TASAKA - 0.6.4-1 +- 0.6.4 + * Tue Feb 11 2025 Mamoru TASAKA - 0.6.3^20241025gitb51af4c5-1 - Update to the latest git diff --git a/sources b/sources index 367a0a5..9eb30d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxappearance-20250211T1538.tar.gz) = 79eabb5b1df18792d9cec9db36f812d48494b10646ee92ae411eea2addec9c5962d2f3627e5222ba997dbdd680f1616cec838c24adc7f99f5b163c536a3304b3 +SHA512 (lxappearance-20250325T1621.tar.gz) = ab48ed776beff4ce6d5a5419306669dab5af91c8bdac794454535b5eb2993ec66ab110b5356c69c2be95ca3d1403d350466b2bbe97b87731d0fa61b0822fa294 From 2919d234565173260b599a3cc89314278c9a22bf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 May 2025 16:43:26 +0900 Subject: [PATCH 32/33] Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) --- lxappearance.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index f2c795f..f558ca1 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -37,7 +37,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -138,6 +138,8 @@ git add . git commit -m "base" -q %endif +# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) +export ACLOCAL_PATH=%{_datadir}/gettext/m4/ sh autogen.sh @@ -192,6 +194,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Mon May 26 2025 Mamoru TASAKA - 0.6.4-2 +- Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) + * Tue Mar 25 2025 Mamoru TASAKA - 0.6.4-1 - 0.6.4 From 32cd926f5299486f4b317739e75f02cc8d59934c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:04:58 +0000 Subject: [PATCH 33/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lxappearance.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxappearance.spec b/lxappearance.spec index f558ca1..bc03c79 100644 --- a/lxappearance.spec +++ b/lxappearance.spec @@ -37,7 +37,7 @@ Name: lxappearance Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Feature-rich GTK+ theme switcher for LXDE # SPDX confirmed @@ -194,6 +194,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 26 2025 Mamoru TASAKA - 0.6.4-2 - Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708)