diff options
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/kicad-devel/Makefile | 1 | ||||
| -rw-r--r-- | cad/kicad-devel/Makefile.git_rev | 4 | ||||
| -rw-r--r-- | cad/kicad-devel/distinfo | 6 | ||||
| -rw-r--r-- | cad/kicad-devel/files/newVersion.sh | 11 | ||||
| -rw-r--r-- | cad/kicad-devel/files/patch-include-system-libcontext.h | 29 |
5 files changed, 26 insertions, 25 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index e2c408adc15e..1f205558bb51 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -29,6 +29,7 @@ USE_GL= glew glu gl USE_WX= 3.0 WX_COMPS= wx USE_GNOME= atk cairo # Required by libwx_gtk2_aui-2.8.so +USE_XORG+= pixman BROKEN_aarch64= Fails to compile: use of undeclared identifier builtin_ia32_emms diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev index 26883b0e8ae0..19d0ea9062b3 100644 --- a/cad/kicad-devel/Makefile.git_rev +++ b/cad/kicad-devel/Makefile.git_rev @@ -1,2 +1,2 @@ -GIT_SRC_HASH= a73abbfc314f0462d304c3b7e18941158116fb7f -GIT_SRC_DATE= 20170308230210 +GIT_SRC_HASH= 28a6ca1e23904b080ef34cf9bc1fed91d2191cc9 +GIT_SRC_DATE= 20170312170442 diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo index a5b6395ba0cd..0e208d2cc9fa 100644 --- a/cad/kicad-devel/distinfo +++ b/cad/kicad-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489012995 -SHA256 (kicad/kicad-r20170308230210.tar.bz2) = 6abd7dbb60aa14e734e62195a974b73c4fcb7e626b5cfc7be7a6d8123bbacac9 -SIZE (kicad/kicad-r20170308230210.tar.bz2) = 221688625 +TIMESTAMP = 1489401968 +SHA256 (kicad/kicad-r20170312170442.tar.bz2) = 50de7ddf1c4390afaa62c29ed7682bff32e55fbf48391900b55212e7067b6bd5 +SIZE (kicad/kicad-r20170312170442.tar.bz2) = 221885144 diff --git a/cad/kicad-devel/files/newVersion.sh b/cad/kicad-devel/files/newVersion.sh index a0609e68891c..a2b1b105d802 100644 --- a/cad/kicad-devel/files/newVersion.sh +++ b/cad/kicad-devel/files/newVersion.sh @@ -8,10 +8,11 @@ CURDIR=`pwd` WRKDIR=`pwd`/work mkdir -p "${WRKDIR}" -if [ \! -f "${WRKDIR}/master.zip" ]; then \ - fetch --no-verify-peer -o ${WRKDIR}/master.zip https://github.com/KiCad/kicad-library/archive/master.zip +if [ \! -d "${CURDIR}/kicad-library" ]; then + git clone https://github.com/KiCad/kicad-library.git "${CURDIR}/kicad-library"; else - echo "master.zip already exists"; + cd "${CURDIR}/kicad-library" + git pull; fi if [ \! -d "${CURDIR}/kicad-repo" ]; then @@ -30,10 +31,12 @@ echo "$GIT_SRC_HASH, $GIT_SRC_DATE" echo "GIT_SRC_HASH= ${GIT_SRC_HASH}" > ${CURDIR}/Makefile.git_rev echo "GIT_SRC_DATE= ${GIT_SRC_DATE}" >> ${CURDIR}/Makefile.git_rev +mkdir -p "${WRKDIR}/kicad-library-master" mkdir -p "${WRKDIR}/kicad-r${GIT_SRC_DATE}" cd "${CURDIR}/kicad-repo" find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-r${GIT_SRC_DATE}"; +cd "${CURDIR}/kicad-library" +find . -type d -name .git -prune -o -print | cpio -pdamuv "${WRKDIR}/kicad-library-master" cd "${WRKDIR}" -tar xvf master.zip; tar cvfy /usr/ports/distfiles/kicad/kicad-r${GIT_SRC_DATE}.tar.bz2 \ kicad-r${GIT_SRC_DATE} kicad-library-master diff --git a/cad/kicad-devel/files/patch-include-system-libcontext.h b/cad/kicad-devel/files/patch-include-system-libcontext.h index ec9bc4f4753f..e5632ddee0df 100644 --- a/cad/kicad-devel/files/patch-include-system-libcontext.h +++ b/cad/kicad-devel/files/patch-include-system-libcontext.h @@ -1,24 +1,21 @@ ---- include/system/libcontext.h.orig 2017-03-08 13:29:09.028153000 +0100 -+++ include/system/libcontext.h 2017-03-08 13:31:22.843111000 +0100 -@@ -23,5 +23,5 @@ +--- include/system/libcontext.h.orig 2017-03-13 11:47:23.495919000 +0100 ++++ include/system/libcontext.h 2017-03-13 11:51:12.678651000 +0100 +@@ -23,13 +23,15 @@ -#if defined(__GNUC__) || defined(__APPLE__) +#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__) #define LIBCONTEXT_COMPILER_gcc -@@ -55,5 +55,5 @@ - #define LIBCONTEXT_CALL_CONVENTION __cdecl - #endif -- #elif defined(__APPLE__) && defined(__MACH__) -+ #elif defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) - #if defined (__i386__) - #define LIBCONTEXT_PLATFORM_apple_i386 -@@ -62,4 +62,7 @@ - #define LIBCONTEXT_PLATFORM_apple_x86_64 + +- #if defined(__linux__) ++ #if defined(__linux__) || defined(__FreeBSD__) + #ifdef __x86_64__ + #define LIBCONTEXT_PLATFORM_linux_x86_64 #define LIBCONTEXT_CALL_CONVENTION -+ #elif defined (__amd64__) -+ #define LIBCONTEXT_PLATFORM_apple_x86_64 +- ++ #elif __amd64 ++ #define LIBCONTEXT_PLATFORM_linux_x86_64 + #define LIBCONTEXT_CALL_CONVENTION - #endif - #endif + #elif __i386__ + #define LIBCONTEXT_PLATFORM_linux_i386 |