drmingw: Update patches.

2015-06-21 16:33:30 +03:00
parent 8c7dbc064b
commit 3e8b0e877c
6 changed files with 139 additions and 30 deletions
--- a/mingw-w64-drmingw-git/PKGBUILD
+++ b/mingw-w64-drmingw-git/PKGBUILD
@@ -2,31 +2,27 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>

 _realname=drmingw
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=r443.9c71cf6
-pkgrel=1
+pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname})
+pkgver=0.7.3
+pkgrel=2
 pkgdesc="Just-in-Time (JIT) debugger (mingw-w64)"
 arch=('any')
-license=(LGPL2.1)
+license=(LGPL2)
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "git")
-provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc")
 url=('https://github.com/jrfonseca/drmingw')
-source=("${_realname}"::"git+https://github.com/jrfonseca/drmingw.git"
-        import-libs.patch)
+source=(${_realname}-${pkgver}.tar.gz::"https://github.com/jrfonseca/drmingw/archive/${pkgver}.tar.gz"
+        import-libs.patch
+        install-files.patch)
 options=(!strip staticlibs)
-md5sums=('SKIP'
-         'eae409030c925865fa24cb7f56478e7a')
-
-pkgver() {
-  cd "$srcdir/$_realname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+md5sums=('2a606a5dfb85e6092ae82acbd4612a7c'
+         '98685a69354829d13d3f6821fc0ad390'
+         '79edeee894e906bc3cce20f7f170de0c')

 prepare() {
-  cd ${_realname}
+  cd "${srcdir}/${_realname}-${pkgver}"
  patch -p1 -i ${srcdir}/import-libs.patch
+  patch -p1 -i ${srcdir}/install-files.patch
 }

 build() {
@@ -36,15 +32,13 @@ build() {
  ${MINGW_PREFIX}/bin/cmake.exe \
    -G"MSYS Makefiles" \
    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \
-    ../${_realname}
+    ../${_realname}-${pkgver}
  make
 }

 package() {
  cd "${srcdir}/build-${MINGW_CHOST}"
  make -j1 install
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/doc
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/sample

-  install -Dm644 "${srcdir}/${_realname}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
--- a/mingw-w64-drmingw-git/import-libs.patch
+++ b/mingw-w64-drmingw-git/import-libs.patch
@@ -1,11 +1,32 @@
+--- drmingw/CMakeLists.txt.orig	2015-06-21 14:48:57.330400000 +0300
+++ drmingw/CMakeLists.txt	2015-06-21 14:49:03.554800000 +0300
+@@ -60,10 +60,6 @@
+     set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++")
+ endif ()
+ 
+-if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--kill-at")
+-endif ()
+-
+ # Put all executables into top-level bin subdirectory
+ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 --- drmingw/src/exchndl/CMakeLists.txt.orig	2015-06-20 21:46:52.998600000 +0300
 +++ drmingw/src/exchndl/CMakeLists.txt	2015-06-20 21:46:57.741000000 +0300
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,11 @@
 -add_library (exchndl MODULE
+if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set (EXCHNDL_DEF exchndl32.def)
+else ()
+    set (EXCHNDL_DEF exchndl.def)
+endif ()
 +add_library (exchndl SHARED
     exchndl.c
-     exchndl.def
+-    exchndl.def
+    ${EXCHNDL_DEF}
     version.rc
+ )
+ 
@@ -15,4 +15,8 @@
     PREFIX ""
 )
@@ -16,6 +37,11 @@
 +         LIBRARY DESTINATION lib
 +         ARCHIVE DESTINATION lib
 +)
+--- /dev/null	2015-06-21 14:20:14.000000000 +0300
+++ drmingw/src/exchndl/exchndl32.def	2015-06-21 14:18:57.437200000 +0300
+@@ -0,0 +1,2 @@
+EXPORTS
+    SetLogFileNameA@4
 --- drmingw/src/mgwhelp/CMakeLists.txt.orig	2015-06-20 21:56:28.342000000 +0300
 +++ drmingw/src/mgwhelp/CMakeLists.txt	2015-06-20 22:08:56.832200000 +0300
@@ -23,7 +23,11 @@
--- a/mingw-w64-drmingw-git/install-files.patch
+++ b/mingw-w64-drmingw-git/install-files.patch
@@ -0,0 +1,31 @@
+--- drmingw/CMakeLists.txt.orig	2015-06-21 14:26:32.215200000 +0300
+++ drmingw/CMakeLists.txt	2015-06-21 14:27:19.342800000 +0300
+@@ -120,7 +120,7 @@
+     FILES
+         LICENSE.txt
+         README.md
+-    DESTINATION doc
+    DESTINATION share/doc/drmingw
+ )
+ 
+ # cpack mistakenly detects Mingw-w64 as win32
+--- drmingw/sample/CMakeLists.txt.orig	2015-06-21 14:27:55.165000000 +0300
+++ drmingw/sample/CMakeLists.txt	2015-06-21 14:28:26.833000000 +0300
+@@ -6,5 +6,5 @@
+     exchndl2.cpp
+ )
+ 
+-install (FILES sample.cpp exchndl2.cpp DESTINATION sample)
+-install (FILES sample.mak DESTINATION sample RENAME Makefile)
+install (FILES sample.cpp exchndl2.cpp DESTINATION share/drmingw/sample)
+install (FILES sample.mak DESTINATION share/drmingw/sample RENAME Makefile)
+--- drmingw/thirdparty/dwarf/CMakeLists.txt.orig	2015-06-21 14:33:35.812200000 +0300
+++ drmingw/thirdparty/dwarf/CMakeLists.txt	2015-06-21 14:33:45.733800000 +0300
+@@ -38,6 +38,6 @@
+ 
+ install (
+     FILES LIBDWARFCOPYRIGHT
+-    DESTINATION doc
+    DESTINATION share/doc/drmingw
+     RENAME LICENSE-libdwarf.txt
+ )
--- a/mingw-w64-drmingw/PKGBUILD
+++ b/mingw-w64-drmingw/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=drmingw
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname})
 pkgver=0.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Just-in-Time (JIT) debugger (mingw-w64)"
 arch=('any')
 license=(LGPL2)
@@ -12,14 +12,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc")
 url=('https://github.com/jrfonseca/drmingw')
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/jrfonseca/drmingw/archive/${pkgver}.tar.gz"
-        import-libs.patch)
+        import-libs.patch
+        install-files.patch)
 options=(!strip staticlibs)
 md5sums=('2a606a5dfb85e6092ae82acbd4612a7c'
-         'eae409030c925865fa24cb7f56478e7a')
+         '36a51f93ad1c1fa1d911af1886688dda'
+         '79edeee894e906bc3cce20f7f170de0c')

 prepare() {
  cd "${srcdir}/${_realname}-${pkgver}"
  patch -p1 -i ${srcdir}/import-libs.patch
+  patch -p1 -i ${srcdir}/install-files.patch
 }

 build() {
@@ -36,8 +39,6 @@ build() {
 package() {
  cd "${srcdir}/build-${MINGW_CHOST}"
  make -j1 install
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/doc
-  rm -rf "${pkgdir}${MINGW_PREFIX}"/sample

  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
--- a/mingw-w64-drmingw/import-libs.patch
+++ b/mingw-w64-drmingw/import-libs.patch
@@ -1,11 +1,32 @@
+--- drmingw/CMakeLists.txt.orig	2015-06-21 14:48:57.330400000 +0300
+++ drmingw/CMakeLists.txt	2015-06-21 14:49:03.554800000 +0300
+@@ -60,10 +60,6 @@
+     set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++")
+ endif ()
+ 
+-if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--kill-at")
+-endif ()
+-
+ # Put all executables into top-level bin subdirectory
+ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 --- drmingw/src/exchndl/CMakeLists.txt.orig	2015-06-20 21:46:52.998600000 +0300
 +++ drmingw/src/exchndl/CMakeLists.txt	2015-06-20 21:46:57.741000000 +0300
-@@ -1,4 +1,4 @@
+@@ -1,6 +1,11 @@
 -add_library (exchndl MODULE
+if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set (EXCHNDL_DEF exchndl32.def)
+else ()
+    set (EXCHNDL_DEF exchndl.def)
+endif ()
 +add_library (exchndl SHARED
     exchndl.c
-     exchndl.def
+-    exchndl.def
+    ${EXCHNDL_DEF}
     version.rc
+ )
+ 
@@ -15,4 +15,8 @@
     PREFIX ""
 )
@@ -16,6 +37,11 @@
 +         LIBRARY DESTINATION lib
 +         ARCHIVE DESTINATION lib
 +)
+--- /dev/null	2015-06-21 14:20:14.000000000 +0300
+++ drmingw/src/exchndl/exchndl32.def	2015-06-21 14:18:57.437200000 +0300
+@@ -0,0 +1,2 @@
+EXPORTS
+    ExcHndlSetLogFileNameA@4
 --- drmingw/src/mgwhelp/CMakeLists.txt.orig	2015-06-20 21:56:28.342000000 +0300
 +++ drmingw/src/mgwhelp/CMakeLists.txt	2015-06-20 22:08:56.832200000 +0300
@@ -23,7 +23,11 @@
--- a/mingw-w64-drmingw/install-files.patch
+++ b/mingw-w64-drmingw/install-files.patch
@@ -0,0 +1,31 @@
+--- drmingw/CMakeLists.txt.orig	2015-06-21 14:26:32.215200000 +0300
+++ drmingw/CMakeLists.txt	2015-06-21 14:27:19.342800000 +0300
+@@ -120,7 +120,7 @@
+     FILES
+         LICENSE.txt
+         README.md
+-    DESTINATION doc
+    DESTINATION share/doc/drmingw
+ )
+ 
+ # cpack mistakenly detects Mingw-w64 as win32
+--- drmingw/sample/CMakeLists.txt.orig	2015-06-21 14:27:55.165000000 +0300
+++ drmingw/sample/CMakeLists.txt	2015-06-21 14:28:26.833000000 +0300
+@@ -6,5 +6,5 @@
+     exchndl2.cpp
+ )
+ 
+-install (FILES sample.cpp exchndl2.cpp DESTINATION sample)
+-install (FILES sample.mak DESTINATION sample RENAME Makefile)
+install (FILES sample.cpp exchndl2.cpp DESTINATION share/drmingw/sample)
+install (FILES sample.mak DESTINATION share/drmingw/sample RENAME Makefile)
+--- drmingw/thirdparty/dwarf/CMakeLists.txt.orig	2015-06-21 14:33:35.812200000 +0300
+++ drmingw/thirdparty/dwarf/CMakeLists.txt	2015-06-21 14:33:45.733800000 +0300
+@@ -38,6 +38,6 @@
+ 
+ install (
+     FILES LIBDWARFCOPYRIGHT
+-    DESTINATION doc
+    DESTINATION share/doc/drmingw
+     RENAME LICENSE-libdwarf.txt
+ )