Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpick for openSUSE:Factory checked in at 2026-09-22 15:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpick (Old) and /work/SRC/openSUSE:Factory/.gpick.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpick" Tue Sep 22 15:53:39 2026 rev:21 rq:1379657 version:0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/gpick/gpick.changes 2025-09-30 17:49:06.758256456 +0200 +++ /work/SRC/openSUSE:Factory/.gpick.new.383539/gpick.changes 2026-09-22 15:55:20.177479194 +0200 @@ -1,0 +2,33 @@ +Fri Sep 18 18:30:00 UTC 2026 - Bjørn Lie <[email protected]> + +- Update to version 0.4: + + Bug Fixes: Fix broken color name editing. + + Features: + - Add Oklab and Oklch color space support + - Add background color picker tool + - Add edit dialog for multiple selected colors + - Add equalize tool for palette colors + - Add name input to add/edit dialog + - Add option to use current palette in closest colors tool + - Add pie chart layouts + - Add screenshot button to palette from image tool + - Add temporary palette window support + - Allow search in palette by partial color code or name + - Save/restore palette column widths + - Update display filters while configuring +- Drop patches merged upstream: + + fix-boost-184.patch + + fix-version-check.patch + + import-missing-scons.patch +- Drop no longer needed patches: + + revert-cpp-lua.patch + + gpick-boost-without-systemd.patch +- Add patches: + + gpick-0.4-crash-on-start.patch: Fix crash on startup when + settings are empty + + gpick-0.4-lua-5.5.patch: Add support for lua 5.5 +- Drop obsolete update-desktop-files BuildRequires and conditional + post(un) handling for older versions of openSUSE. +- Drop COPYRIGHT as source, tarball contains a proper license file. + +------------------------------------------------------------------- Old: ---- copyright fix-boost-184.patch fix-version-check.patch gpick-0.3.tar.gz gpick-boost-without-systemd.patch import-missing-scons.patch revert-cpp-lua.patch New: ---- _scmsync.obsinfo build.specials.obscpio gpick-0.4-crash-on-start.patch gpick-0.4-lua-5.5.patch gpick-0.4.tar.gz ----------(Old B)---------- Old:- Drop patches merged upstream: + fix-boost-184.patch + fix-version-check.patch Old: + fix-boost-184.patch + fix-version-check.patch + import-missing-scons.patch Old: + revert-cpp-lua.patch + gpick-boost-without-systemd.patch - Add patches: Old: + fix-version-check.patch + import-missing-scons.patch - Drop no longer needed patches: Old:- Drop no longer needed patches: + revert-cpp-lua.patch + gpick-boost-without-systemd.patch ----------(Old E)---------- ----------(New B)---------- New:- Add patches: + gpick-0.4-crash-on-start.patch: Fix crash on startup when settings are empty New: settings are empty + gpick-0.4-lua-5.5.patch: Add support for lua 5.5 - Drop obsolete update-desktop-files BuildRequires and conditional ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpick.spec ++++++ --- /var/tmp/diff_new_pack.2BKTuZ/_old 2026-09-22 15:55:20.962511534 +0200 +++ /var/tmp/diff_new_pack.2BKTuZ/_new 2026-09-22 15:55:20.964511617 +0200 @@ -18,24 +18,18 @@ %define appname org.gpick.gpick Name: gpick -Version: 0.3 +Version: 0.4 Release: 0 Summary: Advanced color picker writen in GTK+ License: BSD-3-Clause -Group: Productivity/Graphics/Visualization/Other URL: http://www.gpick.org/ Source0: https://github.com/thezbyg/gpick/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: copyright -# PATCH-FIX-UPSTREAM fix-boost-184.patch gh#thezbyg/gpick#227 [email protected] -- Fix builds with boost -Patch1: fix-boost-184.patch -# PATCH-FIX-UPSTREAM fix-version-check.patch gh#thezbyg/gpick#215 [email protected] -- Fix path in build -Patch2: fix-version-check.patch -# PATCH-FIX-UPSTREAM import-missing-scons.patch gh#thezbyg/gpick#216 [email protected] -- Fix import of SCons -Patch3: import-missing-scons.patch -# PATCH-FIX-UPSTREAM revert-cpp-lua.patch gh#thezbyg/gpick#217 [email protected] -- Don't use nonexistant lua-c++ -Patch4: revert-cpp-lua.patch -# PATCH-FIX-UPSTREAM gpick-boost-without-systemd.patch -- Bump boost dep to 1.69, where system is header-only -Patch5: gpick-boost-without-systemd.patch + +# PATCH-FIX-UPSTREAM gpick-0.4-crash-on-start.patch -- Fix crash on startup when settings are empty +Patch0: gpick-0.4-crash-on-start.patch +# PATCH-FIX-UPSTREAM gpick-0.4-lua-5.5.patch -- Add support for lua 5.5 +Patch1: gpick-0.4-lua-5.5.patch + BuildRequires: boost-devel BuildRequires: expat BuildRequires: flex @@ -49,12 +43,9 @@ BuildRequires: pkgconfig BuildRequires: ragel BuildRequires: scons -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(lua) >= 5.3 +BuildRequires: pkgconfig(lua) >= 5.4 %description Gpick is a featured color picker with palette creation and modification @@ -64,53 +55,29 @@ %prep %autosetup -p1 +# Delete external libraries and only use system dependencies to build GPick +rm -rf extern +echo "INTERNAL_EXPAT=False" >> user-config.py +echo "INTERNAL_LUA=False" >> user-config.py +echo "LOCALEDIR=\"%{_datadir}/locale\"" >> user-config.py +echo "%{version}" > .version %build -export CFLAGS="%optflags" -export CXXFLAGS="%optflags" -%cmake -%cmake_build +%cmake \ + -DCFLAGS="%{optflags} -Wl,--as-needed" \ + -DCXXFLAGS="%%{optflags} -Wl,--as-needed --std=c++17" \ + -DLDFLAGS="%%{optflags} -Wl,--as-needed" \ + -DPREFER_VERSION_FILE=True \ + -DLUA_TYPE="C" -%check -./build/tests +%cmake_build %install -export CFLAGS="%optflags" -export CXXFLAGS="%optflags" %cmake_install -%if 0%{?suse_version} -%suse_update_desktop_file %{appname} Viewer -%endif -# Install copyright file. This file was given to me by the author/upstream. -cp %{SOURCE1} COPYRIGHT %find_lang %{name} %{?no_lang_C} -%if 0%{?suse_version} && 0%{?suse_version} < 1330 -%post -%icon_theme_cache_post - -%postun -%icon_theme_cache_postun -%endif - -%if 0%{?fedora_version} - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - %files -%defattr(-,root,root) -%doc COPYRIGHT +%license LICENSE.txt %{_bindir}/%{name} %{_datadir}/applications/%{appname}.desktop %{_datadir}/metainfo/%{appname}.metainfo.xml ++++++ _scmsync.obsinfo ++++++ mtime: 1790071030 commit: 86667e9200bc2ba71f143098461a0c4801d352fee078dc091c779cbc81b6ba1c url: https://src.opensuse.org/GNOME/gpick revision: 86667e9200bc2ba71f143098461a0c4801d352fee078dc091c779cbc81b6ba1c trackingbranch: factory projectscmsync: https://src.opensuse.org/GNOME/_ObsPrj ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-09-22 11:57:10.000000000 +0200 @@ -0,0 +1,5 @@ +*.obscpio +*.osc +_build.* +.pbuild +osc-collab.* ++++++ gpick-0.4-crash-on-start.patch ++++++ >From 480f9ef15bb657aed0d320d67e30197fe02bcad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albertas=20Vy=C5=A1niauskas?= <[email protected]> Date: Sun, 30 Nov 2025 10:16:29 +0200 Subject: [PATCH] Fix crash on startup when settings are empty. Issue #234. --- source/GlobalState.cpp | 2 +- source/dynv/Map.cpp | 11 +++++++---- source/dynv/Map.h | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/GlobalState.cpp b/source/GlobalState.cpp index 47b5a2f..1f130cb 100644 --- a/source/GlobalState.cpp +++ b/source/GlobalState.cpp @@ -48,7 +48,7 @@ struct ConverterOptions: public Converter::Options, public IEventHandler { m_settings(settings) { } void update() { - auto options = m_settings.getMap("gpick.options"); + auto options = m_settings.getOrEmptyMap("gpick.options"); upperCaseHex = options->getString("hex_case", "upper") == "upper"; cssPercentages = options->getBool("css_percentages", false); cssAlphaPercentage = options->getBool("css_alpha_percentage", false); diff --git a/source/dynv/Map.cpp b/source/dynv/Map.cpp index a895951..7d3c26b 100644 --- a/source/dynv/Map.cpp +++ b/source/dynv/Map.cpp @@ -118,9 +118,6 @@ std::vector<Color> Map::getColors(const std::string &name) const { std::vector<std::string> Map::getStrings(const std::string &name) const { return getVector<std::string>(*this, name); } -Ref Map::getMap(const std::string &name) { - return get<Ref>(*this, name); -} Ref Map::getOrCreateMap(const std::string &name) { bool valid; std::string fieldName; @@ -141,9 +138,15 @@ Ref Map::getOrCreateMap(const std::string &name) { } return std::get<Ref>(data); } -const Ref Map::getMap(const std::string &name) const { +Ref Map::getMap(const std::string &name) const { return get<Ref>(*this, name); } +Ref Map::getOrEmptyMap(const std::string &name) const { + auto result = get<Ref>(*this, name); + if (!result) + return create(); + return result; +} std::vector<Ref> Map::getMaps(const std::string &name) { bool valid; std::string fieldName; diff --git a/source/dynv/Map.h b/source/dynv/Map.h index 832405a..d6910a7 100644 --- a/source/dynv/Map.h +++ b/source/dynv/Map.h @@ -56,9 +56,9 @@ struct Map: public common::Ref<Map>::Counter { std::vector<int32_t> getInt32s(const std::string &name) const; std::vector<Color> getColors(const std::string &name) const; std::vector<std::string> getStrings(const std::string &name) const; - Ref getMap(const std::string &name); std::vector<Ref> getMaps(const std::string &name); - const Ref getMap(const std::string &name) const; + Ref getMap(const std::string &name) const; + Ref getOrEmptyMap(const std::string &name) const; std::vector<Ref> getMaps(const std::string &name) const; Ref getOrCreateMap(const std::string &name); std::vector<Ref> getOrCreateMaps(const std::string &name); -- 2.55.0 ++++++ gpick-0.4-lua-5.5.patch ++++++ diff -up gpick-274745c23398554acc3cf40fefb2ce5ce3c21197/CMakeLists.txt.lua55 gpick-274745c23398554acc3cf40fefb2ce5ce3c21197/CMakeLists.txt --- gpick-274745c23398554acc3cf40fefb2ce5ce3c21197/CMakeLists.txt.lua55 2026-03-02 18:55:35.060294420 -0500 +++ gpick-274745c23398554acc3cf40fefb2ce5ce3c21197/CMakeLists.txt 2026-03-02 18:56:37.684031999 -0500 @@ -46,9 +46,9 @@ if (PkgConfig_FOUND) unset(Lua_FOUND CACHE) endif() if (NOT LUA_TYPE STREQUAL "C") - pkg_search_module(Lua REQUIRED lua5.4-c++>=5.4 lua5-c++>=5.4 lua-c++>=5.4 lua5.3-c++>=5.3 lua5-c++>=5.3 lua-c++>=5.3 lua5.2-c++>=5.2 lua5-c++>=5.2 lua-c++>=5.2) + pkg_search_module(Lua REQUIRED lua5.5-c++>=5.5 lua5-c++>=5.5 lua-c++>=5.5 lua5.4-c++>=5.4 lua5-c++>=5.4 lua-c++>=5.4 lua5.3-c++>=5.3 lua5-c++>=5.3 lua-c++>=5.3 lua5.2-c++>=5.2 lua5-c++>=5.2 lua-c++>=5.2) else() - pkg_search_module(Lua REQUIRED lua5.4>=5.4 lua5>=5.4 lua>=5.4 lua5.3>=5.3 lua5>=5.3 lua>=5.3 lua5.2>=5.2 lua5>=5.2 lua>=5.2) + pkg_search_module(Lua REQUIRED lua5.5>=5.5 lua5>=5.5 lua>=5.5 lua5.4>=5.4 lua5>=5.4 lua>=5.4 lua5.3>=5.3 lua5>=5.3 lua>=5.3 lua5.2>=5.2 lua5>=5.2 lua>=5.2) endif() set(CURRENT_LUA_TYPE ${LUA_TYPE} CACHE INTERNAL "") pkg_search_module(Expat REQUIRED expat>=1.0) ++++++ gpick-0.3.tar.gz -> gpick-0.4.tar.gz ++++++ ++++ 34399 lines of diff (skipped)
