pkgsrc-Changes archive

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

CVS commit: pkgsrc/x11/wxGTK32



Module Name:    pkgsrc
Committed By:   dbj
Date:           Thu Jul 28 05:25:23 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK32: Makefile PLIST PLIST.configure distinfo
Added Files:
        pkgsrc/x11/wxGTK32/patches: patch-build_cmake_config.cmake
            patch-build_cmake_install.cmake
            patch-build_cmake_utils_CMakeLists.txt

Log Message:
x11/wxGTK32: for cmake builds, install binaries into libexec/wx-3.2

this avoids conflicts with wxGTK28 and wxGTK30
take upstream patches for DESTDIR support
also respect CMAKE_INSTALL_BINDIR instead of assuming "bin"


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/wxGTK32/Makefile pkgsrc/x11/wxGTK32/PLIST \
    pkgsrc/x11/wxGTK32/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/wxGTK32/PLIST.configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_config.cmake \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt

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

Modified files:

Index: pkgsrc/x11/wxGTK32/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.2 pkgsrc/x11/wxGTK32/Makefile:1.3
--- pkgsrc/x11/wxGTK32/Makefile:1.2     Tue Jul 26 02:58:56 2022
+++ pkgsrc/x11/wxGTK32/Makefile Thu Jul 28 05:25:22 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/07/26 02:58:56 dbj Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/28 05:25:22 dbj Exp $
 
 DISTNAME=      wxWidgets-3.2.0
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wxWidgets/}
 GITHUB_PROJECT=        wxWidgets
@@ -45,6 +45,7 @@ PKG_SUPPORTED_OPTIONS=        cmake
 .if !empty(PKG_OPTIONS:Mcmake)
 USE_CMAKE=             yes
 CMAKE_ARGS+=           -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
+CMAKE_ARGS+=           -DCMAKE_INSTALL_BINDIR:STRING=libexec/wx-3.2
 PLIST_SRC+=            PLIST.cmake
 
 . if ${OPSYS} != "Darwin"
@@ -89,23 +90,14 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/docs/lgpl.txt ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DESTDIR}${PREFIX}/${DOCDIR}
-.if defined(USE_CMAKE)
-# Installation rules in cmake are not using DESTDIR properly, do it manually
-# https://github.com/wxWidgets/wxWidgets/issues/22647
-# CMake Error: failed to create symbolic link '/usr/pkg/bin/wx-config': Permission denied
-# CMake Error: failed to create symbolic link '/usr/pkg/bin/wxrc': Permission denied
-       ${LN} -sf ../${WX_CONFIG} ${DESTDIR}${PREFIX}/bin/wx-config-3.2
-.endif
-.if defined(GNU_CONFIGURE)
-       ${LN} -sf ../libexec/wx-3.2/wxrc-3.2 ${DESTDIR}${PREFIX}/bin/wxrc-3.2
+       ${LN} -sf ../libexec/wx-3.2/wxrc ${DESTDIR}${PREFIX}/bin/wxrc-3.2
        ${LN} -sf ../libexec/wx-3.2/wx-config ${DESTDIR}${PREFIX}/bin/wx-config-3.2
-.endif
 
 .if defined(USE_CMAKE)
 SUBST_CLASSES+=                unwrap
 SUBST_STAGE.unwrap=    post-build
 SUBST_FILES.unwrap=    ${WX_CONFIG}
-SUBST_SED.unwrap=      -e "s,EGREP=.*,EGREP=${EGREP},"
+SUBST_SED.unwrap=      -e 's,EGREP=.*,EGREP=${EGREP},'
 SUBST_SED.unwrap+=     -e 's,echo.*/${CC}",echo "${CC}",'
 SUBST_SED.unwrap+=     -e 's,echo.*/${CXX}",echo "${CXX}",'
 SUBST_SED.unwrap+=     -e 's,echo.*/${CXX} -o",echo "${CXX} -o",'
Index: pkgsrc/x11/wxGTK32/PLIST
diff -u pkgsrc/x11/wxGTK32/PLIST:1.2 pkgsrc/x11/wxGTK32/PLIST:1.3
--- pkgsrc/x11/wxGTK32/PLIST:1.2        Tue Jul 26 02:58:56 2022
+++ pkgsrc/x11/wxGTK32/PLIST    Thu Jul 28 05:25:22 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/07/26 02:58:56 dbj Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/07/28 05:25:22 dbj Exp $
 bin/wx-config-3.2
 bin/wxrc-3.2
 include/wx-3.2/wx/aboutdlg.h
@@ -799,6 +799,9 @@ lib/libwx_gtk3u_webview-3.2.so.0.0.0
 lib/libwx_gtk3u_xrc-3.2.so
 lib/libwx_gtk3u_xrc-3.2.so.0
 lib/libwx_gtk3u_xrc-3.2.so.0.0.0
+libexec/wx-3.2/wx-config
+libexec/wx-3.2/wxrc
+libexec/wx-3.2/wxrc-3.2
 share/wx-3.2/doc/wxWidgets/changes.txt
 share/wx-3.2/doc/wxWidgets/lgpl.txt
 share/wx-3.2/doc/wxWidgets/licence.txt
Index: pkgsrc/x11/wxGTK32/distinfo
diff -u pkgsrc/x11/wxGTK32/distinfo:1.2 pkgsrc/x11/wxGTK32/distinfo:1.3
--- pkgsrc/x11/wxGTK32/distinfo:1.2     Tue Jul 26 02:58:56 2022
+++ pkgsrc/x11/wxGTK32/distinfo Thu Jul 28 05:25:22 2022
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.2 2022/07/26 02:58:56 dbj Exp $
+$NetBSD: distinfo,v 1.3 2022/07/28 05:25:22 dbj Exp $
 
 BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa52819adf16a8ed4860ea
 SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967
 Size (wxWidgets-3.2.0.tar.bz2) = 25296814 bytes
+SHA1 (patch-build_cmake_config.cmake) = 3f2a53683e212d0fe9be966b7dd887b2240c57eb
 SHA1 (patch-build_cmake_init.cmake) = 5b203660ee4c1376b2d8083be73fdcd0c1d09833
+SHA1 (patch-build_cmake_install.cmake) = 4afe2ec2c6c6e28b941dad3974771da7ed1b41be
 SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3
 SHA1 (patch-build_cmake_setup.cmake) = 277ae3c5bf4f04d057402f0b626d09d1e9749ca8
+SHA1 (patch-build_cmake_utils_CMakeLists.txt) = ccd342e1b565c942fb61730a91713323fd3d8cb2
 SHA1 (patch-configure) = fd7330fd1d83d42f7b95af61130e4db131de90b6
 SHA1 (patch-configure.in) = ad62f55a628e52de89b43001fc37a179fb50e7b3
 SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7

Index: pkgsrc/x11/wxGTK32/PLIST.configure
diff -u pkgsrc/x11/wxGTK32/PLIST.configure:1.1 pkgsrc/x11/wxGTK32/PLIST.configure:1.2
--- pkgsrc/x11/wxGTK32/PLIST.configure:1.1      Tue Jul 26 02:58:56 2022
+++ pkgsrc/x11/wxGTK32/PLIST.configure  Thu Jul 28 05:25:22 2022
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST.configure,v 1.1 2022/07/26 02:58:56 dbj Exp $
-libexec/wx-3.2/wx-config
-libexec/wx-3.2/wxrc
-libexec/wx-3.2/wxrc-3.2
+@comment $NetBSD: PLIST.configure,v 1.2 2022/07/28 05:25:22 dbj Exp $
 share/wx-3.2/aclocal/wxwin.m4
 share/wx-3.2/bakefile/presets/wx.bkl
 share/wx-3.2/bakefile/presets/wx_presets.py

Added files:

Index: pkgsrc/x11/wxGTK32/patches/patch-build_cmake_config.cmake
diff -u /dev/null pkgsrc/x11/wxGTK32/patches/patch-build_cmake_config.cmake:1.1
--- /dev/null   Thu Jul 28 05:25:23 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_config.cmake   Thu Jul 28 05:25:22 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_cmake_config.cmake,v 1.1 2022/07/28 05:25:22 dbj Exp $
+
+Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
+
+--- build/cmake/config.cmake.orig      2022-07-06 14:19:50.000000000 +0000
++++ build/cmake/config.cmake
+@@ -87,7 +87,7 @@ function(wx_write_config)
+     set(exec_prefix "\${prefix}")
+     set(includedir "\${prefix}/include")
+     set(libdir "\${exec_prefix}/lib")
+-    set(bindir "\${exec_prefix}/bin")
++    set(bindir "\${exec_prefix}/${CMAKE_INSTALL_BINDIR}")
+ 
+     find_program(EGREP egrep)
+     mark_as_advanced(EGREP)
Index: pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake
diff -u /dev/null pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake:1.1
--- /dev/null   Thu Jul 28 05:25:23 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake  Thu Jul 28 05:25:22 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-build_cmake_install.cmake,v 1.1 2022/07/28 05:25:22 dbj Exp $
+
+Fix use of DESTDIR
+https://github.com/wxWidgets/wxWidgets/issues/22610
+
+Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
+
+--- build/cmake/install.cmake.orig     2022-07-28 04:31:27.000000000 +0000
++++ build/cmake/install.cmake
+@@ -39,11 +39,11 @@ else()
+                     WORLD_EXECUTE WORLD_READ
+         )
+ 
+-    install(DIRECTORY DESTINATION "bin")
++    install(DIRECTORY DESTINATION "${CMAKE_INSTALL_BINDIR}")
+     install(CODE "execute_process( \
+         COMMAND ${CMAKE_COMMAND} -E create_symlink \
+         ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \
+-        ${CMAKE_INSTALL_PREFIX}/bin/wx-config \
++        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config\" \
+         )"
+     )
+ endif()
+@@ -96,8 +96,8 @@ if(NOT TARGET ${UNINST_NAME})
+         endif()
+ 
+         set(WX_EXTRA_UNINSTALL_FILES
+-            "${CMAKE_INSTALL_PREFIX}/bin/wx-config"
+-            "${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}"
++            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config"
++            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}"
+         )
+     endif()
+ 
Index: pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt
diff -u /dev/null pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt:1.1
--- /dev/null   Thu Jul 28 05:25:23 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt   Thu Jul 28 05:25:22 2022
@@ -0,0 +1,38 @@
+$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.1 2022/07/28 05:25:22 dbj Exp $
+
+Fix use of DESTDIR
+https://github.com/wxWidgets/wxWidgets/issues/22610
+
+Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
+
+--- build/cmake/utils/CMakeLists.txt.orig      2022-07-28 04:31:27.000000000 +0000
++++ build/cmake/utils/CMakeLists.txt
+@@ -26,21 +26,22 @@ if(wxUSE_XRC)
+     set_target_properties(wxrc PROPERTIES FOLDER "Utilities")
+ 
+     wx_install(TARGETS wxrc
+-        RUNTIME DESTINATION "bin"
+-        BUNDLE DESTINATION "bin"
++        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++        BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
+         )
+ 
+-    if(NOT WIN32_MSVC_NAMING)
++    if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL)
+         if(IPHONE)
+             set(EXE_SUFFIX ".app")
+         else()
+             set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX})
+         endif()
+ 
+-        wx_install(CODE "execute_process( \
++        # Don't use wx_install() here to preserve escaping.
++        install(CODE "execute_process( \
+             COMMAND ${CMAKE_COMMAND} -E create_symlink \
+-            ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \
+-            ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
++            ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${wxrc_output_name}${EXE_SUFFIX} \
++            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}\" \
+             )"
+         )
+     endif()



Home | Main Index | Thread Index | Old Index