pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics/gpick



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Oct  4 04:17:38 UTC 2024

Modified Files:
        pkgsrc/graphics/gpick: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/gpick/patches: patch-source_ColorSpaceType.cpp
            patch-source_Converter.cpp patch-source_GlobalState.cpp
            patch-source_Paths.cpp patch-source_dynv_Types.cpp
            patch-source_layout_Layout.cpp patch-source_lua_Color.cpp
            patch-source_lua_ColorObject.cpp patch-source_lua_DynvSystem.cpp
            patch-source_lua_Extensions.cpp patch-source_lua_GlobalState.cpp
            patch-source_lua_I18N.cpp patch-source_lua_Layout.cpp
            patch-source_lua_Ref.cpp patch-source_lua_Script.cpp
            patch-source_test_Script.cpp patch-source_uiDialogOptions.cpp
Removed Files:
        pkgsrc/graphics/gpick/patches: patch-SConscript

Log Message:
graphics/gpick: Update to 0.3

* Fix build with Boost 1.86.0.
* Fix usage of Lua include file to fix link.
* Convert to CMake build.

Changelog:
0.3:
Bug Fixes

    Fix layout switching (issue #189).
    Prevent wrong data directory selection (issue #189).
    Fix crash due to zero-length string access (issue #193).

Features

    Add alpha channel support.
    Add additional converters.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/graphics/gpick/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gpick/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/gpick/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/gpick/patches/patch-SConscript
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gpick/patches/patch-source_ColorSpaceType.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_Converter.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_GlobalState.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_Paths.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_dynv_Types.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_layout_Layout.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_Color.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_ColorObject.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_DynvSystem.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_Extensions.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_GlobalState.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_I18N.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_Layout.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_Ref.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_lua_Script.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_test_Script.cpp \
    pkgsrc/graphics/gpick/patches/patch-source_uiDialogOptions.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gpick/Makefile
diff -u pkgsrc/graphics/gpick/Makefile:1.47 pkgsrc/graphics/gpick/Makefile:1.48
--- pkgsrc/graphics/gpick/Makefile:1.47 Fri Oct  4 03:49:25 2024
+++ pkgsrc/graphics/gpick/Makefile      Fri Oct  4 04:17:37 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2024/10/04 03:49:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2024/10/04 04:17:37 ryoon Exp $
 
-DISTNAME=      gpick-0.2.6
-PKGREVISION=   13
+DISTNAME=      gpick-0.3
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=thezbyg/}
-GITHUB_TAG=    ${DISTNAME}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/thezbyg/gpick/
@@ -12,32 +11,19 @@ COMMENT=    Advanced color picker
 LICENSE=       modified-bsd
 
 USE_LANGUAGES= c c++
-USE_TOOLS+=    pkg-config msgfmt msgmerge xgettext
+USE_TOOLS+=    gmake pkg-config msgfmt msgmerge xgettext
 
-USE_CXX_FEATURES+=     c++14
+USE_CXX_FEATURES+=     filesystem
 
 TOOL_DEPENDS+= ragel-[0-9]*:../../devel/ragel
 
-PYTHON_VERSIONS_ACCEPTED=      27      # as of 0.2.5
-
-SCONS_ARGS+=   DESTDIR=${DESTDIR}${PREFIX}
-
-SUBST_CLASSES+=                man
-SUBST_STAGE.man=       pre-configure
-SUBST_FILES.man+=      SConscript
-SUBST_SED.man+=                -e "s,/share/man/man1,/${PKGMANDIR}/man1,g"
-
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS}
-
-do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} install
+CXXFLAGS+=     -Wno-sign-compare
+LDFLAGS+=      -llua
 
 .include "../../devel/boost-libs/buildlink3.mk"
-PYTHON_FOR_BUILD_ONLY?=        yes
-.include "../../devel/scons/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../lang/lua/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gpick/PLIST
diff -u pkgsrc/graphics/gpick/PLIST:1.2 pkgsrc/graphics/gpick/PLIST:1.3
--- pkgsrc/graphics/gpick/PLIST:1.2     Fri Nov 12 16:17:20 2021
+++ pkgsrc/graphics/gpick/PLIST Fri Oct  4 04:17:37 2024
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2021/11/12 16:17:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/10/04 04:17:37 ryoon Exp $
 bin/gpick
-man/man1/gpick.1
-share/applications/gpick.desktop
+share/applications/org.gpick.gpick.desktop
 share/doc/gpick/copyright
+share/gpick/.gpick-data-directory
 share/gpick/color_dictionary_0.txt
 share/gpick/converters.lua
 share/gpick/gpick-falloff-cubic.png
@@ -24,5 +24,6 @@ share/locale/es/LC_MESSAGES/gpick.mo
 share/locale/lt/LC_MESSAGES/gpick.mo
 share/locale/ru/LC_MESSAGES/gpick.mo
 share/locale/sv/LC_MESSAGES/gpick.mo
-share/metainfo/gpick.appdata.xml
-share/mime/packages/gpick.xml
+share/man/man1/gpick.1
+share/metainfo/org.gpick.gpick.metainfo.xml
+share/mime/packages/org.gpick.gpick.xml

Index: pkgsrc/graphics/gpick/distinfo
diff -u pkgsrc/graphics/gpick/distinfo:1.4 pkgsrc/graphics/gpick/distinfo:1.5
--- pkgsrc/graphics/gpick/distinfo:1.4  Fri Nov 12 16:17:20 2021
+++ pkgsrc/graphics/gpick/distinfo      Fri Oct  4 04:17:37 2024
@@ -1,6 +1,22 @@
-$NetBSD: distinfo,v 1.4 2021/11/12 16:17:20 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/10/04 04:17:37 ryoon Exp $
 
-BLAKE2s (gpick-0.2.6.tar.gz) = 26745d0822db138c0f1bbd860c2fe8cac6c501de8e02be6e57b9621d6712e929
-SHA512 (gpick-0.2.6.tar.gz) = 85f4d0978915e0c0b6e412d619a28af62a43547d39c4b97d8dddc4024f9d8b339f09e91f70d929073ebbad7a6e008e174aa76fdc611008ba269dedb403ed6867
-Size (gpick-0.2.6.tar.gz) = 363810 bytes
-SHA1 (patch-SConscript) = b934c7e48eedbc08fcdc38c558ff35e38fb446c8
+BLAKE2s (gpick-0.3.tar.gz) = 1b8ea789b855386643370284bfede925c41b2b76af10e491002c299176f4fabf
+SHA512 (gpick-0.3.tar.gz) = bf782c3be6399439589da9d6c59dc21af9551818412b3c197b375ba93fe9cba6fee0f668b81db653f04a1817e33fc87c8d8faf27d305d26ee61f119b8d4af987
+Size (gpick-0.3.tar.gz) = 368100 bytes
+SHA1 (patch-source_ColorSpaceType.cpp) = 5ce8ef285aca682d952c534a279d6c9257b4a830
+SHA1 (patch-source_Converter.cpp) = 7f96ea22dc179e341f3f893b73b91b8a2c6fb100
+SHA1 (patch-source_GlobalState.cpp) = 7c238a60945191aeedb23623adc73ba520b18827
+SHA1 (patch-source_Paths.cpp) = 3f8a7b7bb62651c49036396292ddc9f7c2a7f40e
+SHA1 (patch-source_dynv_Types.cpp) = 0b0846725dc3301a419cf0537e215eda4a51592c
+SHA1 (patch-source_layout_Layout.cpp) = 81af21d502a46bc8962abfd5e7b55ffccaa740ef
+SHA1 (patch-source_lua_Color.cpp) = c8dea1b5a0351d8a749256805f9411f3639d9568
+SHA1 (patch-source_lua_ColorObject.cpp) = 316ef998da6214c845f5f6054cf1471d04027658
+SHA1 (patch-source_lua_DynvSystem.cpp) = ee17b5b4c75a6ad6614aa3ec82edfd0dec2d7e58
+SHA1 (patch-source_lua_Extensions.cpp) = 8a1ca3fed7edf07e476959c88428a571daf53c48
+SHA1 (patch-source_lua_GlobalState.cpp) = 209885eabeeab02633251e20713108993b191981
+SHA1 (patch-source_lua_I18N.cpp) = ce073b27c5075f5f39019d674530cf4da234c69f
+SHA1 (patch-source_lua_Layout.cpp) = 8133b4511177beb08b4a54a93af2b084d1c548bc
+SHA1 (patch-source_lua_Ref.cpp) = 4ecb3d3e32d176c4e857b4bac0513b8cfc5f8bbb
+SHA1 (patch-source_lua_Script.cpp) = dcecccf7a520042b4c19f14bdc80f91ca7488725
+SHA1 (patch-source_test_Script.cpp) = 57a9b7a161288bee804b38a394901e8fb6bc9ebf
+SHA1 (patch-source_uiDialogOptions.cpp) = 8df28647d30caeb2c3cff461382a0820c7c8bbd9

Added files:

Index: pkgsrc/graphics/gpick/patches/patch-source_ColorSpaceType.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_ColorSpaceType.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_ColorSpaceType.cpp       Fri Oct  4 04:17:37 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_ColorSpaceType.cpp,v 1.1 2024/10/04 04:17:37 ryoon Exp $
+
+--- source/ColorSpaceType.cpp.orig     2024-10-02 09:41:24.365191141 +0000
++++ source/ColorSpaceType.cpp
+@@ -22,7 +22,7 @@
+ #include "lua/Color.h"
+ #include "lua/Script.h"
+ #include "lua/Callbacks.h"
+-#include <lua.h>
++#include <lua.hpp>
+ #include <iostream>
+ using namespace std;
+ 
Index: pkgsrc/graphics/gpick/patches/patch-source_Converter.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_Converter.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_Converter.cpp    Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_Converter.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/Converter.cpp.orig  2024-10-02 10:01:14.451815447 +0000
++++ source/Converter.cpp
+@@ -33,8 +33,7 @@
+ #include <vector>
+ #include <iostream>
+ #include <functional>
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ using namespace std;
+ Converter::Converter(const char *name, const char *label, lua::Ref &&serialize, lua::Ref &&deserialize):
+       m_name(name),
Index: pkgsrc/graphics/gpick/patches/patch-source_GlobalState.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_GlobalState.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_GlobalState.cpp  Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_GlobalState.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/GlobalState.cpp.orig        2024-10-02 10:00:21.498694912 +0000
++++ source/GlobalState.cpp
+@@ -37,8 +37,7 @@
+ #include <filesystem>
+ #include <stdlib.h>
+ #include <glib/gstdio.h>
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ #include <fstream>
+ #include <iostream>
+ struct GlobalState::Impl {
Index: pkgsrc/graphics/gpick/patches/patch-source_Paths.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_Paths.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_Paths.cpp        Fri Oct  4 04:17:38 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_Paths.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/Paths.cpp.orig      2024-10-02 09:32:54.911598061 +0000
++++ source/Paths.cpp
+@@ -36,7 +36,7 @@ struct PathException: std::runtime_error
+               std::runtime_error(message) {
+       }
+ };
+-#if BOOST_OS_LINUX != 0
++#if BOOST_OS_LINUX != 0 || BOOST_OS_BSD_NET != 0
+ static std::string getExecutablePath() {
+       std::vector<char> buffer;
+       buffer.resize(4096);
Index: pkgsrc/graphics/gpick/patches/patch-source_dynv_Types.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_dynv_Types.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_dynv_Types.cpp   Fri Oct  4 04:17:38 2024
@@ -0,0 +1,12 @@
+$NetBSD: patch-source_dynv_Types.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/dynv/Types.cpp.orig 2024-10-02 09:08:30.817212346 +0000
++++ source/dynv/Types.cpp
+@@ -21,6 +21,7 @@
+ #include "Color.h"
+ #include <algorithm>
+ #include <boost/endian/conversion.hpp>
++#include <boost/version.hpp>
+ namespace dynv {
+ namespace xml {
+ bool serialize(std::ostream &stream, const Map &map, bool addRootElement = true);
Index: pkgsrc/graphics/gpick/patches/patch-source_layout_Layout.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_layout_Layout.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_layout_Layout.cpp        Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_layout_Layout.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/layout/Layout.cpp.orig      2024-10-02 10:01:34.779610928 +0000
++++ source/layout/Layout.cpp
+@@ -20,8 +20,7 @@
+ #include "System.h"
+ #include "../lua/Layout.h"
+ #include <iostream>
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ using namespace std;
+ namespace layout
+ {
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_Color.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_Color.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_Color.cpp    Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_Color.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/Color.cpp.orig  2024-10-02 09:59:05.784850753 +0000
++++ source/lua/Color.cpp
+@@ -18,8 +18,7 @@
+ 
+ #include "Color.h"
+ #include "../Color.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua
+ {
+ static int newColor(lua_State *L)
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_ColorObject.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_ColorObject.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_ColorObject.cpp      Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_ColorObject.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/ColorObject.cpp.orig    2024-10-02 10:00:04.277116526 +0000
++++ source/lua/ColorObject.cpp
+@@ -20,8 +20,7 @@
+ #include "Color.h"
+ #include "Script.h"
+ #include "../ColorObject.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua
+ {
+ static int newColorObject(lua_State *L)
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_DynvSystem.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_DynvSystem.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_DynvSystem.cpp       Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_DynvSystem.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/DynvSystem.cpp.orig     2024-10-02 09:59:17.766079227 +0000
++++ source/lua/DynvSystem.cpp
+@@ -17,8 +17,7 @@
+  */
+ 
+ #include "DynvSystem.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua {
+ dynv::Ref checkDynvSystem(lua_State *L, int index) {
+       void *ud = luaL_checkudata(L, index, "dynvSystem");
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_Extensions.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_Extensions.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_Extensions.cpp       Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_Extensions.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/Extensions.cpp.orig     2024-10-02 09:58:36.188371927 +0000
++++ source/lua/Extensions.cpp
+@@ -31,8 +31,7 @@
+ #include "../Converters.h"
+ #include "../Converter.h"
+ #include "version/Version.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua
+ {
+ static void checkArgumentIsFunctionOrNil(lua_State *L, int index)
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_GlobalState.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_GlobalState.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_GlobalState.cpp      Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_GlobalState.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/GlobalState.cpp.orig    2024-10-02 09:58:18.420701457 +0000
++++ source/lua/GlobalState.cpp
+@@ -18,8 +18,7 @@
+ 
+ #include "GlobalState.h"
+ #include "../GlobalState.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua
+ {
+ void setGlobalState(lua_State *L, GlobalState &global_state)
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_I18N.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_I18N.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_I18N.cpp     Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_I18N.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/I18N.cpp.orig   2024-10-02 09:58:51.304564533 +0000
++++ source/lua/I18N.cpp
+@@ -18,8 +18,7 @@
+ 
+ #include "I18N.h"
+ #include "../I18N.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua
+ {
+ int getText(lua_State *L)
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_Layout.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_Layout.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_Layout.cpp   Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_Layout.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/Layout.cpp.orig 2024-10-02 09:59:48.709013394 +0000
++++ source/lua/Layout.cpp
+@@ -23,8 +23,7 @@
+ #include "../layout/Box.h"
+ #include "../layout/System.h"
+ #include "../layout/Layout.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ #include <typeinfo>
+ #include <iostream>
+ using namespace std;
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_Ref.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_Ref.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_Ref.cpp      Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_Ref.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/Ref.cpp.orig    2024-10-02 10:01:52.073031305 +0000
++++ source/lua/Ref.cpp
+@@ -17,8 +17,7 @@
+  */
+ 
+ #include "Ref.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ namespace lua
+ {
+ Ref::Ref():
Index: pkgsrc/graphics/gpick/patches/patch-source_lua_Script.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_lua_Script.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_lua_Script.cpp   Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_lua_Script.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/lua/Script.cpp.orig 2024-10-02 09:59:31.629499454 +0000
++++ source/lua/Script.cpp
+@@ -18,8 +18,7 @@
+ 
+ #include "Script.h"
+ #include <sstream>
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ #include <iostream>
+ using namespace std;
+ namespace lua
Index: pkgsrc/graphics/gpick/patches/patch-source_test_Script.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_test_Script.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_test_Script.cpp  Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_test_Script.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/test/Script.cpp.orig        2024-10-02 10:00:39.269947217 +0000
++++ source/test/Script.cpp
+@@ -19,8 +19,7 @@
+ #include <boost/test/unit_test.hpp>
+ #include "lua/Script.h"
+ #include "common/Scoped.h"
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ using namespace lua;
+ static int test(lua_State *L) {
+       lua_pushstring(L, "ok");
Index: pkgsrc/graphics/gpick/patches/patch-source_uiDialogOptions.cpp
diff -u /dev/null pkgsrc/graphics/gpick/patches/patch-source_uiDialogOptions.cpp:1.1
--- /dev/null   Fri Oct  4 04:17:38 2024
+++ pkgsrc/graphics/gpick/patches/patch-source_uiDialogOptions.cpp      Fri Oct  4 04:17:38 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_uiDialogOptions.cpp,v 1.1 2024/10/04 04:17:38 ryoon Exp $
+
+--- source/uiDialogOptions.cpp.orig    2024-10-02 10:00:56.519023699 +0000
++++ source/uiDialogOptions.cpp
+@@ -28,8 +28,7 @@
+ #include "lua/Callbacks.h"
+ #include <string>
+ #include <iostream>
+-#include <lualib.h>
+-#include <lauxlib.h>
++#include <lua.hpp>
+ using namespace std;
+ static const struct{
+       const char *label;



Home | Main Index | Thread Index | Old Index