Skip to content

Commit

Permalink
[libqrencode] Remove unnessesary patch, it's in upstream now (#8099)
Browse files Browse the repository at this point in the history
[libqrencode] Add feature to build qrencode tool
  • Loading branch information
crackedmind authored and grdowns committed Sep 11, 2019
1 parent de9bb1d commit 947e0c6
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 19 deletions.
6 changes: 5 additions & 1 deletion ports/libqrencode/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Source: libqrencode
Version: 4.0.2
Version: 4.0.2-1
Build-Depends: libpng, libiconv
Homepage: https://github.com/fukuchi/libqrencode
Description: libqrencode - a fast and compact QR Code encoding library

Feature: tool
Description: Build qrencode tool
Build-Depends: getopt (windows)
13 changes: 13 additions & 0 deletions ports/libqrencode/fix-found-wingetopt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a85c41..92dadca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ if(MSVC)

if(WITH_TOOLS)
find_path(GETOPT_INCLUDE_DIR getopt.h PATH_SUFFIXES include)
- find_library(GETOPT_LIBRARIES wingetopt PATH_SUFFIXES lib)
+ find_library(GETOPT_LIBRARIES getopt PATH_SUFFIXES lib)
include_directories(${GETOPT_INCLUDE_DIR})
endif(WITH_TOOLS)
endif(MSVC)
24 changes: 22 additions & 2 deletions ports/libqrencode/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,38 @@ vcpkg_from_github(
REF v4.0.2
SHA512 847e32bd13358319f3beabde103b5335a6e11c3f9275425b74e89a00b0ee4d67af8a428f12acc8b80a0419382480e5aeb02e58602a69ee750c21b28f357af6bc
HEAD_REF master
PATCHES remove-deprecated-attribute.patch
PATCHES
fix-found-wingetopt.patch
)

if("tool" IN_LIST FEATURES)
set(WITH_TOOLS YES)
else()
set(WITH_TOOLS NO)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DWITH_TOOLS=NO
-DWITH_TOOLS=${WITH_TOOLS}
-DWITH_TEST=NO
-DSKIP_INSTALL_PROGRAMS=ON
-DSKIP_INSTALL_EXECUTABLES=ON
-DSKIP_INSTALL_FILES=ON
OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
-DWITH_TOOLS=NO
)

vcpkg_install_cmake()

if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows
set(EXECUTABLE_SUFFIX ".exe")
else()
set(EXECUTABLE_SUFFIX "")
endif()

if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qrencode.dll)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qrencode.dll ${CURRENT_PACKAGES_DIR}/bin/qrencode.dll)
Expand All @@ -32,6 +46,12 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll ${CURRENT_PACKAGES_DIR}/debug/bin/qrencoded.dll)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX})
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qrencode")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/qrencode/qrencode${EXECUTABLE_SUFFIX}")
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qrencode)
endif()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqrencode)
Expand Down
16 changes: 0 additions & 16 deletions ports/libqrencode/remove-deprecated-attribute.patch

This file was deleted.

0 comments on commit 947e0c6

Please sign in to comment.