diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | undebian.patch | 14 |
3 files changed, 15 insertions, 14 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Nov 11 18:13:20 UTC 2016 +# Wed Jan 17 20:31:59 UTC 2018 pkgbase = usbdm-git pkgdesc = Debugger interface for Freescale RS08,HCS08,HCS12,Coldfire and ARM-Kinetis Devices. - pkgver = 512.fef0fb9 + pkgver = 1102.62ab4f14 pkgrel = 1 url = http://usbdm.sourceforge.net/ install = usbdm.install @@ -11,7 +11,7 @@ pkgbase = usbdm-git license = GPL2 makedepends = java-environment depends = java-runtime - depends = webkitgtk2 + depends = webkit2gtk depends = xerces-c depends = tcl depends = wxgtk @@ -23,7 +23,7 @@ pkgbase = usbdm-git source = undebian.patch source = 60-usbdm.rules sha256sums = SKIP - sha256sums = 70b10fac3ae580ca0f951b94b3713cd2b7a9c023502bf6cfe47ef07206499b52 + sha256sums = 0cedd9a6fcd1abdbfe3df8a2237c152f4c32ffb9c4de191b73ffae1c2895ffa5 sha256sums = 88eaab73a1020ac84d4979a4f70f122214b0042d167942a95bddd0560f0e3aa8 pkgname = usbdm-git @@ -1,12 +1,12 @@ # Maintainer: Thomas Hebb <tommyhebb@gmail.com> pkgname=usbdm-git -pkgver=512.fef0fb9 +pkgver=1102.62ab4f14 pkgrel=1 pkgdesc="Debugger interface for Freescale RS08,HCS08,HCS12,Coldfire and ARM-Kinetis Devices." arch=("i686" "x86_64") url="http://usbdm.sourceforge.net/" license=('GPL2') -depends=("java-runtime" "webkitgtk2" "xerces-c" "tcl" "wxgtk" "xdg-utils") +depends=("java-runtime" "webkit2gtk" "xerces-c" "tcl" "wxgtk" "xdg-utils") makedepends=("java-environment") provides=("usbdm") conflicts=("usbdm") @@ -17,7 +17,7 @@ source=("git+https://github.com/podonoghue/usbdm-eclipse-makefiles-build.git" "undebian.patch" "60-usbdm.rules") sha256sums=('SKIP' - '70b10fac3ae580ca0f951b94b3713cd2b7a9c023502bf6cfe47ef07206499b52' + '0cedd9a6fcd1abdbfe3df8a2237c152f4c32ffb9c4de191b73ffae1c2895ffa5' '88eaab73a1020ac84d4979a4f70f122214b0042d167942a95bddd0560f0e3aa8') pkgver() { @@ -28,6 +28,7 @@ pkgver() { prepare() { cd "${srcdir}/usbdm-eclipse-makefiles-build" patch -p1 -i "${srcdir}/undebian.patch" + sed -i -e 's/xercesc_3_1/xercesc/' 'MergeXML/src/xmlParser.h' } build() { diff --git a/undebian.patch b/undebian.patch index b1387e3134ab..3b22b717ed62 100644 --- a/undebian.patch +++ b/undebian.patch @@ -1,5 +1,5 @@ diff --git a/Common.mk b/Common.mk -index 64325fd..7e30d4e 100644 +index 83a4076f..e0cb81f0 100644 --- a/Common.mk +++ b/Common.mk @@ -47,7 +47,6 @@ else @@ -11,8 +11,8 @@ index 64325fd..7e30d4e 100644 ifeq ($(UNAME_S),Windows) @@ -296,7 +295,7 @@ ifeq ($(UNAME_S),Windows) - JAVA_INC := -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include - JAVA_INC += -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include/win32 + JAVA_INC := -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_131/include + JAVA_INC += -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_131/include/win32 else - JAVA_INC := -I/usr/lib/jvm/default-java/include $(jvm_includes) + JAVA_INC := -I/usr/lib/jvm/default/include -I/usr/lib/jvm/default/include/linux @@ -20,7 +20,7 @@ index 64325fd..7e30d4e 100644 #============================================================= diff --git a/Library.mk b/Library.mk -index 12657ad..500f193 100644 +index 12657ad2..500f1939 100644 --- a/Library.mk +++ b/Library.mk @@ -39,17 +39,8 @@ ifeq ($(UNAME_S),Windows) @@ -44,7 +44,7 @@ index 12657ad..500f193 100644 ifeq ($(UNAME_S),Windows) diff --git a/USBDM_API_Example/Common.mk b/USBDM_API_Example/Common.mk -index d6f5d71..dcbc3b1 100644 +index d6f5d711..dcbc3b1c 100644 --- a/USBDM_API_Example/Common.mk +++ b/USBDM_API_Example/Common.mk @@ -47,7 +47,6 @@ else @@ -65,7 +65,7 @@ index d6f5d71..dcbc3b1 100644 #============================================================= diff --git a/USBDM_Programmer_API_Example/Common.mk b/USBDM_Programmer_API_Example/Common.mk -index 2d8dffd..7988431 100644 +index af7d8c90..3a1a635e 100644 --- a/USBDM_Programmer_API_Example/Common.mk +++ b/USBDM_Programmer_API_Example/Common.mk @@ -47,7 +47,6 @@ else @@ -76,7 +76,7 @@ index 2d8dffd..7988431 100644 endif ifeq ($(UNAME_S),Windows) -@@ -292,7 +291,7 @@ ifeq ($(UNAME_S),Windows) +@@ -290,7 +289,7 @@ ifeq ($(UNAME_S),Windows) JAVA_INC := -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include JAVA_INC += -I$(PROGRAM_DIR_JAVA)/Java/jdk1.8.0_60/include/win32 else |