From 585670a86b0917852e1a3ea10afb44637dee0087 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 7 Mar 2016 19:12:48 +0000 Subject: [PATCH] fix package files for MinGW on Archlinux --- mkspecs/win32/win32.cmake | 2 +- package/archlinux-mingw/PKGBUILD | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/mkspecs/win32/win32.cmake b/mkspecs/win32/win32.cmake index c301ab2e2..c77d5a1bf 100644 --- a/mkspecs/win32/win32.cmake +++ b/mkspecs/win32/win32.cmake @@ -1,6 +1,6 @@ add_definitions(-D_USE_MATH_DEFINES -DUNICODE -DWIN32) if(MINGW) - add_definitions(-D__GNU__) + add_definitions(-D__GNU__) else() add_definitions(-DQT_NEEDS_QMAIN) endif() diff --git a/package/archlinux-mingw/PKGBUILD b/package/archlinux-mingw/PKGBUILD index 3e8a88b50..aefed1313 100644 --- a/package/archlinux-mingw/PKGBUILD +++ b/package/archlinux-mingw/PKGBUILD @@ -17,6 +17,8 @@ sha1sums=('SKIP') conflicts=('mingw-w64-katie') options=('!strip' 'staticlibs' '!buildflags') # 'debug') +_arch="${CARCH}-w64-mingw32" + pkgver() { cd katie printf "4.9.0.%s" "$(git rev-parse --short HEAD)" @@ -25,14 +27,20 @@ pkgver() { prepare() { mkdir -p build - echo 'set(LDCONF_INSTALL_DIR /etc/ld.so.conf.d)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(PROFILE_INSTALL_DIR /etc/profile.d)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(DBUS_INTERFACES_INSTALL_DIR /etc/dbus-1/interfaces)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \ - >> katie/mkspecs/linux/vendor.cmake + echo "set(DBUS_INTERFACES_INSTALL_DIR /usr/${_arch}/etc/dbus-1/interfaces)" \ + >> katie/mkspecs/win32/vendor.cmake + echo "set(CMAKE_INSTALL_DIR /usr/${_arch}/share/cmake)" \ + >> katie/mkspecs/win32/vendor.cmake + echo 'set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie")' \ + >> katie/mkspecs/win32/vendor.cmake + echo 'set(QT_PLUGINS_PATH "${QT_LIBRARIES_PATH}/plugins")' \ + >> katie/mkspecs/win32/vendor.cmake + echo 'set(QT_IMPORTS_PATH "${QT_LIBRARIES_PATH}/imports")' \ + >> katie/mkspecs/win32/vendor.cmake + echo 'set(QT_BINARIES_PATH "${QT_LIBRARIES_PATH}/bin")' \ + >> katie/mkspecs/win32/vendor.cmake + echo 'set(QT_DATA_PATH "${QT_PREFIX_PATH}/share")' \ + >> katie/mkspecs/win32/vendor.cmake } build() { @@ -52,5 +60,5 @@ package() { ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/katie/"*.dll install -vDm644 ../katie/LGPL_EXCEPTION.txt \ - "${pkgdir}/usr/share/licenses/katie-git/LGPL_EXCEPTION.txt" + "${pkgdir}/usr/share/licenses/mingw-w64-katie-git/LGPL_EXCEPTION.txt" } -- 2.11.0