From 7fa95482655d2530b53365b4058238d530727ada Mon Sep 17 00:00:00 2001 From: Blackcrypto Date: Fri, 6 Jan 2023 22:31:26 -0600 Subject: [PATCH] app-misc/gpick: Signed-off-by: Blackcrypto Patched the gpick-0.3 build --- app-misc/gpick/files/.version | 4 + app-misc/gpick/files/gpick-libc.patch | 221 ++++++++++++++++++++++++++ app-misc/gpick/gpick-0.3.ebuild | 11 +- 3 files changed, 233 insertions(+), 3 deletions(-) create mode 100644 app-misc/gpick/files/.version create mode 100644 app-misc/gpick/files/gpick-libc.patch diff --git a/app-misc/gpick/files/.version b/app-misc/gpick/files/.version new file mode 100644 index 000000000..9f5434d96 --- /dev/null +++ b/app-misc/gpick/files/.version @@ -0,0 +1,4 @@ +0.3 +0 +dd27232a4dd08cf6271ecc2a7e96da25f8071ed5 +2022-05-08 \ No newline at end of file diff --git a/app-misc/gpick/files/gpick-libc.patch b/app-misc/gpick/files/gpick-libc.patch new file mode 100644 index 000000000..53fc68250 --- /dev/null +++ b/app-misc/gpick/files/gpick-libc.patch @@ -0,0 +1,221 @@ +diff -Naur gpick-0.3-old/CMakeLists.txt gpick-0.3/CMakeLists.txt +--- gpick-0.3-old/CMakeLists.txt 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/CMakeLists.txt 2023-01-06 22:13:38.778904075 -0600 +@@ -30,7 +30,7 @@ + pkg_check_modules(GTK2 gtk+-2.0>=2.24) + pkg_check_modules(GioUnix gio-unix-2.0>=2.24) + endif() +- pkg_search_module(Lua lua5.4-c++>=5.4 lua5-c++>=5.4 lua5.3-c++>=5.3 lua5-c++>=5.3 lua-c++>=5.3 lua5.2-c++>=5.2 lua-c++>=5.2) ++ pkg_search_module(Lua lua5.4>=5.4 lua5>=5.4 lua5.3>=5.3 lua5>=5.3 lua>=5.3 lua5.2>=5.2 lua>=5.2) + pkg_check_modules(Expat expat>=1.0) + endif() + set(THREADS_PREFER_PTHREAD_FLAG ON) +diff -Naur gpick-0.3-old/source/ColorSpaceType.cpp gpick-0.3/source/ColorSpaceType.cpp +--- gpick-0.3-old/source/ColorSpaceType.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/ColorSpaceType.cpp 2023-01-06 22:13:38.768904076 -0600 +@@ -22,7 +22,9 @@ + #include "lua/Color.h" + #include "lua/Script.h" + #include "lua/Callbacks.h" ++extern "C"{ + #include ++} + #include + using namespace std; + +diff -Naur gpick-0.3-old/source/Converter.cpp gpick-0.3/source/Converter.cpp +--- gpick-0.3-old/source/Converter.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/Converter.cpp 2023-01-06 22:13:38.768904076 -0600 +@@ -33,8 +33,10 @@ + #include + #include + #include ++extern "C"{ + #include + #include ++} + using namespace std; + Converter::Converter(const char *name, const char *label, lua::Ref &&serialize, lua::Ref &&deserialize): + m_name(name), +diff -Naur gpick-0.3-old/source/GlobalState.cpp gpick-0.3/source/GlobalState.cpp +--- gpick-0.3-old/source/GlobalState.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/GlobalState.cpp 2023-01-06 22:13:38.772904075 -0600 +@@ -37,8 +37,10 @@ + #include + #include + #include ++extern "C"{ + #include + #include ++} + #include + #include + struct GlobalState::Impl { +diff -Naur gpick-0.3-old/source/layout/Layout.cpp gpick-0.3/source/layout/Layout.cpp +--- gpick-0.3-old/source/layout/Layout.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/layout/Layout.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -20,8 +20,10 @@ + #include "System.h" + #include "../lua/Layout.h" + #include ++extern "C"{ + #include + #include ++} + using namespace std; + namespace layout + { +diff -Naur gpick-0.3-old/source/lua/Color.cpp gpick-0.3/source/lua/Color.cpp +--- gpick-0.3-old/source/lua/Color.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/Color.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -18,8 +18,10 @@ + + #include "Color.h" + #include "../Color.h" ++extern "C"{ + #include + #include ++} + namespace lua + { + static int newColor(lua_State *L) +diff -Naur gpick-0.3-old/source/lua/ColorObject.cpp gpick-0.3/source/lua/ColorObject.cpp +--- gpick-0.3-old/source/lua/ColorObject.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/ColorObject.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -20,8 +20,10 @@ + #include "Color.h" + #include "Script.h" + #include "../ColorObject.h" ++extern "C"{ + #include + #include ++} + namespace lua + { + static int newColorObject(lua_State *L) +diff -Naur gpick-0.3-old/source/lua/DynvSystem.cpp gpick-0.3/source/lua/DynvSystem.cpp +--- gpick-0.3-old/source/lua/DynvSystem.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/DynvSystem.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -17,8 +17,10 @@ + */ + + #include "DynvSystem.h" ++extern "C"{ + #include + #include ++} + namespace lua { + dynv::Ref checkDynvSystem(lua_State *L, int index) { + void *ud = luaL_checkudata(L, index, "dynvSystem"); +diff -Naur gpick-0.3-old/source/lua/Extensions.cpp gpick-0.3/source/lua/Extensions.cpp +--- gpick-0.3-old/source/lua/Extensions.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/Extensions.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -31,8 +31,10 @@ + #include "../Converters.h" + #include "../Converter.h" + #include "version/Version.h" ++extern "C"{ + #include + #include ++} + namespace lua + { + static void checkArgumentIsFunctionOrNil(lua_State *L, int index) +diff -Naur gpick-0.3-old/source/lua/GlobalState.cpp gpick-0.3/source/lua/GlobalState.cpp +--- gpick-0.3-old/source/lua/GlobalState.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/GlobalState.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -18,8 +18,10 @@ + + #include "GlobalState.h" + #include "../GlobalState.h" ++extern "C"{ + #include + #include ++} + namespace lua + { + void setGlobalState(lua_State *L, GlobalState &global_state) +diff -Naur gpick-0.3-old/source/lua/I18N.cpp gpick-0.3/source/lua/I18N.cpp +--- gpick-0.3-old/source/lua/I18N.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/I18N.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -18,8 +18,10 @@ + + #include "I18N.h" + #include "../I18N.h" ++extern "C"{ + #include + #include ++} + namespace lua + { + int getText(lua_State *L) +diff -Naur gpick-0.3-old/source/lua/Layout.cpp gpick-0.3/source/lua/Layout.cpp +--- gpick-0.3-old/source/lua/Layout.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/Layout.cpp 2023-01-06 22:13:38.770904076 -0600 +@@ -23,8 +23,10 @@ + #include "../layout/Box.h" + #include "../layout/System.h" + #include "../layout/Layout.h" ++extern "C"{ + #include + #include ++} + #include + #include + using namespace std; +diff -Naur gpick-0.3-old/source/lua/Ref.cpp gpick-0.3/source/lua/Ref.cpp +--- gpick-0.3-old/source/lua/Ref.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/Ref.cpp 2023-01-06 22:13:38.770904076 -0600 +@@ -17,8 +17,10 @@ + */ + + #include "Ref.h" ++extern "C"{ + #include + #include ++} + namespace lua + { + Ref::Ref(): +diff -Naur gpick-0.3-old/source/lua/Script.cpp gpick-0.3/source/lua/Script.cpp +--- gpick-0.3-old/source/lua/Script.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/lua/Script.cpp 2023-01-06 22:13:38.771904076 -0600 +@@ -18,8 +18,10 @@ + + #include "Script.h" + #include ++extern "C"{ + #include + #include ++} + #include + using namespace std; + namespace lua +diff -Naur gpick-0.3-old/source/test/Script.cpp gpick-0.3/source/test/Script.cpp +--- gpick-0.3-old/source/test/Script.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/test/Script.cpp 2023-01-06 22:13:38.769904076 -0600 +@@ -19,8 +19,10 @@ + #include + #include "lua/Script.h" + #include "common/Scoped.h" ++extern "C"{ + #include + #include ++} + using namespace lua; + static int test(lua_State *L) { + lua_pushstring(L, "ok"); +diff -Naur gpick-0.3-old/source/uiDialogOptions.cpp gpick-0.3/source/uiDialogOptions.cpp +--- gpick-0.3-old/source/uiDialogOptions.cpp 2022-05-08 05:20:36.000000000 -0500 ++++ gpick-0.3/source/uiDialogOptions.cpp 2023-01-06 22:13:38.776904075 -0600 +@@ -28,8 +28,10 @@ + #include "lua/Callbacks.h" + #include + #include ++extern "C"{ + #include + #include ++} + using namespace std; + static const struct{ + const char *label; diff --git a/app-misc/gpick/gpick-0.3.ebuild b/app-misc/gpick/gpick-0.3.ebuild index 3aeb0b484..01184d544 100644 --- a/app-misc/gpick/gpick-0.3.ebuild +++ b/app-misc/gpick/gpick-0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit cmake xdg DESCRIPTION="Advanced color picker written in C++ using GTK+ toolkit" HOMEPAGE="https://github.com/thezbyg/gpick" SRC_URI="https://github.com/thezbyg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - +RESTRICT="mirror" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -26,9 +26,14 @@ RDEPEND=" DEPEND="${RDEPEND}" -S="${WORKDIR}/gpick-gpick-${PV}" +PATCHES=( ${FILESDIR}/gpick-libc.patch ) src_prepare() { + #echo 0.3 > .version || die + #echo 0 >> .version || die + #echo dd27232a4dd08cf6271ecc2a7e96da25f8071ed5 >> .version || die + #echo 2022-05-08 >> .version || die + cp ${FILESDIR}/.version . cmake_src_prepare }