Attachment 125381 Details for Bug 168996 – devel_piklab.diff

[patch] devel_piklab.diff

devel_piklab.diff (text/x-diff), 9.50 KB, created by tkato432 on 2012-06-18 12:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-06-18 12:00:00 UTC

Size: 9.50 KB

patch

obsolete

>diff -urN /usr/ports/devel/piklab/Makefile devel/piklab/Makefile
>--- /usr/ports/devel/piklab/Makefile	2012-06-01 14:17:45.000000000 +0900
>+++ devel/piklab/Makefile	2012-06-07 21:10:05.000000000 +0900
>@@ -6,10 +6,9 @@
> #
> 
> PORTNAME=	piklab
>-PORTVERSION=	0.15.10
>-PORTREVISION=	2
>+PORTVERSION=	0.16.0
> CATEGORIES=	devel
>-MASTER_SITES=	SF/${PORTNAME}/newest%20release/${PORTVERSION}
>+MASTER_SITES=	SF
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	KDE IDE for microcontroller development
>@@ -18,7 +17,9 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USE_BZIP2=	yes
>-USE_KDELIBS_VER=3
>+USE_QT4=	corelib gui qt3support qtestlib xml \
>+		moc_build qmake_build rcc_build uic_build
>+USE_KDE4=	automoc4 kdehier kdelibs kdeprefix sharedmime
> USE_GETTEXT=	yes
> USE_CMAKE=	yes
> INSTALLS_ICONS=	yes
>@@ -40,6 +41,9 @@
> 	@${REINPLACE_CMD} -e \
> 		'/install/s|^|#|' ${WRKSRC}/CMakeLists.txt
> 	@${REINPLACE_CMD} -e \
>+		'/CMAKE_BUILD_TYPE/s|^|#| ; \
>+		 /KDE4/s|INCLUDE_DIRS|INCLUDES|' ${WRKSRC}/cmake/Piklab.cmake
>+	@${REINPLACE_CMD} -e \
> 		'/install/s|share/man|man|' ${WRKSRC}/man/CMakeLists.txt
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/devel/piklab/distinfo devel/piklab/distinfo
>--- /usr/ports/devel/piklab/distinfo	2011-09-05 21:06:03.000000000 +0900
>+++ devel/piklab/distinfo	2012-06-06 20:32:05.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (piklab-0.15.10.tar.bz2) = 9ae1fc44bdd8eb99d67d74507a55b8115579791bc36235fa4a93748bbd18b418
>-SIZE (piklab-0.15.10.tar.bz2) = 929956
>+SHA256 (piklab-0.16.0.tar.bz2) = f79d29e795f158a388d07fe1fe23ef912ea77ba74428efd1bcdd23e2c3ded788
>+SIZE (piklab-0.16.0.tar.bz2) = 931968
>diff -urN /usr/ports/devel/piklab/files/patch-doc__CMakeLists.txt devel/piklab/files/patch-doc__CMakeLists.txt
>--- /usr/ports/devel/piklab/files/patch-doc__CMakeLists.txt	2011-09-10 17:34:51.000000000 +0900
>+++ devel/piklab/files/patch-doc__CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,6 +0,0 @@
>---- ./doc/CMakeLists.txt.orig	2011-09-04 14:24:24.000000000 +0200
>-+++ ./doc/CMakeLists.txt	2011-09-04 14:26:07.000000000 +0200
>-@@ -1,2 +1,2 @@
>- 
>--install(FILES index.docbook DESTINATION share/doc/HTML/en/piklab)
>-+install(FILES index.docbook DESTINATION share/doc/piklab/HTML/en)
>diff -urN /usr/ports/devel/piklab/files/patch-src_common__port__hid_port.cpp devel/piklab/files/patch-src_common__port__hid_port.cpp
>--- /usr/ports/devel/piklab/files/patch-src_common__port__hid_port.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ devel/piklab/files/patch-src_common__port__hid_port.cpp	2012-06-06 23:03:03.000000000 +0900
>@@ -0,0 +1,17 @@
>+--- src/common/port/hid_port.cpp.orig	2012-06-04 07:17:40.000000000 +0900
>++++ src/common/port/hid_port.cpp	2012-06-06 23:02:40.000000000 +0900
>+@@ -7,6 +7,8 @@
>+  *   the Free Software Foundation; either version 2 of the License, or     *
>+  *   (at your option) any later version.                                   *
>+  ***************************************************************************/
>++#ifdef __linux
>++
>+ #include "hid_port.h"
>+ 
>+ #ifdef Q_OS_UNIX
>+@@ -140,3 +142,5 @@
>+ }
>+ 
>+ #endif
>++
>++#endif
>diff -urN /usr/ports/devel/piklab/files/patch-src_common__port__port.cpp devel/piklab/files/patch-src_common__port__port.cpp
>--- /usr/ports/devel/piklab/files/patch-src_common__port__port.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ devel/piklab/files/patch-src_common__port__port.cpp	2012-06-06 23:01:48.000000000 +0900
>@@ -0,0 +1,35 @@
>+--- src/common/port/port.cpp.orig	2012-06-04 07:17:40.000000000 +0900
>++++ src/common/port/port.cpp	2012-06-06 23:01:04.000000000 +0900
>+@@ -60,8 +60,12 @@
>+ const PortType::Data PortType::DATA[Nb_Types] = {
>+   { I18N_NOOP("Serial Port"),   "serial",   true  },
>+   { I18N_NOOP("Parallel Port"), "parallel", true  },
>++#ifdef __linux
>+   { I18N_NOOP("USB Port"),      "usb",      false },
>+   { I18N_NOOP("HID Port"),      "hid",      false }
>++#else
>++  { I18N_NOOP("USB Port"),      "usb",      false }
>++#endif
>+ };
>+ 
>+ const char * const Port::IO_DIR_NAMES[3] = { "no_io", "in", "out" };
>+@@ -73,7 +77,9 @@
>+     case PortType::Serial:   return Serial::probedDeviceList();
>+     case PortType::Parallel: return Parallel::probedDeviceList();
>+     case PortType::USB:      return USB::probedDeviceList();
>++#ifdef __linux
>+     case PortType::HID:      return HID::probedDeviceList();
>++#endif
>+     case PortType::Nb_Types: break;
>+   }
>+   return QStringList();
>+@@ -85,7 +91,9 @@
>+     case PortType::Serial:   return Serial::isAvailable();
>+     case PortType::Parallel: return Parallel::isAvailable();
>+     case PortType::USB:      return USB::isAvailable();
>++#ifdef __linux
>+     case PortType::HID:      return HID::isAvailable();
>++#endif
>+     case PortType::Nb_Types: break;
>+   }
>+   return false;
>diff -urN /usr/ports/devel/piklab/pkg-plist devel/piklab/pkg-plist
>--- /usr/ports/devel/piklab/pkg-plist	2011-09-05 21:06:03.000000000 +0900
>+++ devel/piklab/pkg-plist	2012-06-18 04:58:03.000000000 +0900
>@@ -2,70 +2,25 @@
> bin/piklab-coff
> bin/piklab-hex
> bin/piklab-prog
>-share/applications/kde/piklab.desktop
>+share/applications/kde4/piklab.desktop
> share/apps/katepart/syntax/asm-pic.xml
> share/apps/katepart/syntax/coff-c-pic.xml
> share/apps/katepart/syntax/coff-pic.xml
> share/apps/katepart/syntax/jal-pic.xml
> share/apps/piklab/hexeditorpartui.rc
>+share/apps/piklab/katepartui.rc
>+share/apps/piklab/pics/breakpoint_active.png
>+share/apps/piklab/pics/breakpoint_disabled.png
>+share/apps/piklab/pics/breakpoint_invalid.png
>+share/apps/piklab/pics/breakpoint_reached.png
>+share/apps/piklab/pics/program_counter.png
>+share/apps/piklab/pics/program_counter_disabled.png
> share/apps/piklab/piklabui.rc
>-%%DOCSDIR%%/HTML/en/index.docbook
>-share/icons/hicolor/16x16/actions/piklab_addcurrentfile.png
>-share/icons/hicolor/16x16/actions/piklab_addfile.png
>-share/icons/hicolor/16x16/actions/piklab_blankcheck.png
>-share/icons/hicolor/16x16/actions/piklab_burnchip.png
>-share/icons/hicolor/16x16/actions/piklab_chip.png
>-share/icons/hicolor/16x16/actions/piklab_closeproject.png
>-share/icons/hicolor/16x16/actions/piklab_compile.png
>-share/icons/hicolor/16x16/actions/piklab_createproject.png
>-share/icons/hicolor/16x16/actions/piklab_decompile.png
>-share/icons/hicolor/16x16/actions/piklab_editproject.png
>-share/icons/hicolor/16x16/actions/piklab_erasechip.png
>-share/icons/hicolor/16x16/actions/piklab_find_next.png
>-share/icons/hicolor/16x16/actions/piklab_find_previous.png
>-share/icons/hicolor/16x16/actions/piklab_likeback_bug.png
>-share/icons/hicolor/16x16/actions/piklab_likeback_dislike.png
>-share/icons/hicolor/16x16/actions/piklab_likeback_like.png
>-share/icons/hicolor/16x16/actions/piklab_openproject.png
>-share/icons/hicolor/16x16/actions/piklab_readchip.png
>-share/icons/hicolor/16x16/actions/piklab_verifychip.png
>+share/doc/HTML/en/piklab/index.docbook
> share/icons/hicolor/16x16/apps/piklab.png
>-share/icons/hicolor/22x22/actions/piklab_addcurrentfile.png
>-share/icons/hicolor/22x22/actions/piklab_addfile.png
>-share/icons/hicolor/22x22/actions/piklab_blankcheck.png
>-share/icons/hicolor/22x22/actions/piklab_breakpoint_active.png
>-share/icons/hicolor/22x22/actions/piklab_breakpoint_disabled.png
>-share/icons/hicolor/22x22/actions/piklab_breakpoint_invalid.png
>-share/icons/hicolor/22x22/actions/piklab_breakpoint_reached.png
>-share/icons/hicolor/22x22/actions/piklab_burnchip.png
>-share/icons/hicolor/22x22/actions/piklab_chip.png
>-share/icons/hicolor/22x22/actions/piklab_closeproject.png
>-share/icons/hicolor/22x22/actions/piklab_compile.png
>-share/icons/hicolor/22x22/actions/piklab_createproject.png
>-share/icons/hicolor/22x22/actions/piklab_debug_step.png
>-share/icons/hicolor/22x22/actions/piklab_debug_stepin.png
>-share/icons/hicolor/22x22/actions/piklab_debug_stepout.png
>-share/icons/hicolor/22x22/actions/piklab_debug_stepover.png
>-share/icons/hicolor/22x22/actions/piklab_debughalt.png
>-share/icons/hicolor/22x22/actions/piklab_decompile.png
>-share/icons/hicolor/22x22/actions/piklab_editproject.png
>-share/icons/hicolor/22x22/actions/piklab_erasechip.png
>-share/icons/hicolor/22x22/actions/piklab_find_next.png
>-share/icons/hicolor/22x22/actions/piklab_find_previous.png
>-share/icons/hicolor/22x22/actions/piklab_openproject.png
>-share/icons/hicolor/22x22/actions/piklab_power.png
>-share/icons/hicolor/22x22/actions/piklab_program_counter.png
>-share/icons/hicolor/22x22/actions/piklab_program_counter_disabled.png
>-share/icons/hicolor/22x22/actions/piklab_readchip.png
>-share/icons/hicolor/22x22/actions/piklab_restart.png
>-share/icons/hicolor/22x22/actions/piklab_run.png
>-share/icons/hicolor/22x22/actions/piklab_stop.png
>-share/icons/hicolor/22x22/actions/piklab_verifychip.png
>-share/icons/hicolor/32x32/actions/piklab_config_assembler.png
>-share/icons/hicolor/32x32/actions/piklab_config_disassembler.png
>-share/icons/hicolor/32x32/actions/piklab_config_programmer.png
> share/icons/hicolor/32x32/apps/piklab.png
> share/icons/hicolor/32x32/mimetypes/piklab_project.png
>+share/icons/hicolor/48x48/apps/piklab.png
> share/icons/hicolor/64x64/apps/piklab.png
> share/locale/cs/LC_MESSAGES/piklab.mo
> share/locale/de/LC_MESSAGES/piklab.mo
>@@ -73,11 +28,9 @@
> share/locale/fr/LC_MESSAGES/piklab.mo
> share/locale/hu/LC_MESSAGES/piklab.mo
> share/locale/it/LC_MESSAGES/piklab.mo
>-share/mimelnk/application/x-piklab.desktop
>-@dirrmtry %%DOCSDIR%%/HTML/en
>-@dirrmtry %%DOCSDIR%%/HTML
>-@dirrmtry %%DOCSDIR%%
>+share/mime/packages/piklab.xml
>+@dirrm share/doc/HTML/en/piklab
>+@dirrm share/apps/piklab/pics
> @dirrm share/apps/piklab
>-@dirrmtry share/apps/katepart/syntax
>-@dirrmtry share/apps/katepart
>-@dirrmtry share/apps
>+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
>+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 168996: 125380 | 125381