Attachment #130294 for bug #174194

Lines 1-12 Link Here

(-)devel/piklab/Makefile (-10 / +4 lines)
1	# New ports collection makefile for: piklab	1	# Created by: Michael Nottebrock <lofi@kiste>
2	# Date created: 2007-11-19
3	# Whom: Michael Nottebrock <lofi@kiste>
4	#
5	# $FreeBSD: head/devel/piklab/Makefile 302052 2012-08-05 04:57:57Z miwi $	2	# $FreeBSD: head/devel/piklab/Makefile 302052 2012-08-05 04:57:57Z miwi $
6	#
7		3
8	PORTNAME= piklab	4	PORTNAME= piklab
9	PORTVERSION= 0.16.1	5	PORTVERSION= 0.16.2
10	CATEGORIES= devel	6	CATEGORIES= devel
11	MASTER_SITES= SF	7	MASTER_SITES= SF
12		8
Lines 14-20 Link Here
14	COMMENT= KDE IDE for microcontroller development	10	COMMENT= KDE IDE for microcontroller development
15		11
16	LICENSE= GPLv2 # (or later)	12	LICENSE= GPLv2 # (or later)
17	LICENSE_FILE= ${WRKSRC}/COPYING
18		13
19	OPTIONS_DEFINE= KDE4	14	OPTIONS_DEFINE= KDE4
20	OPTIONS_DEFAULT=KDE4	15	OPTIONS_DEFAULT=KDE4
Lines 22-27 Link Here
22	USE_BZIP2= yes	17	USE_BZIP2= yes
23	USE_QT4= corelib gui qt3support qtestlib xml \	18	USE_QT4= corelib gui qt3support qtestlib xml \
24	moc_build qmake_build rcc_build uic_build	19	moc_build qmake_build rcc_build uic_build
		20	USE_NCURSES= yes
		21	USE_READLINE= yes
25	USE_GETTEXT= yes	22	USE_GETTEXT= yes
26	USE_CMAKE= yes	23	USE_CMAKE= yes
27	MAKE_JOBS_SAFE= yes	24	MAKE_JOBS_SAFE= yes
Lines 55-63 Link Here
55	@${REINPLACE_CMD} -e \	52	@${REINPLACE_CMD} -e \
56	'/man/s\|^\|#\| ; \	53	'/man/s\|^\|#\| ; \
57	/install/s\|^\|#\|' ${WRKSRC}/CMakeLists.txt	54	/install/s\|^\|#\|' ${WRKSRC}/CMakeLists.txt
58	@${REINPLACE_CMD} -e \
59	'/CMAKE_BUILD_TYPE/s\|^\|#\| ; \
60	/KDE4/s\|INCLUDE_DIRS\|INCLUDES\|' ${WRKSRC}/cmake/Piklab.cmake
61		55
62	post-install:	56	post-install:
63	${INSTALL_MAN} ${WRKSRC}/man/piklab-*.1 ${MANPREFIX}/man/man1	57	${INSTALL_MAN} ${WRKSRC}/man/piklab-*.1 ${MANPREFIX}/man/man1

Lines 1-2 Link Here

(-)devel/piklab/distinfo (-2 / +2 lines)
1	SHA256 (piklab-0.16.1.tar.bz2) = 80db24022de47a7377412912b1fd186d6ad08fafa042bed17b49ada2de56004d	1	SHA256 (piklab-0.16.2.tar.bz2) = 51de9edda8edb9d2e9d07ed1c479b83b87eb6fb17c85717477f05fac03a5740e
2	SIZE (piklab-0.16.1.tar.bz2) = 972681	2	SIZE (piklab-0.16.2.tar.bz2) = 1036644




--- cmake/Piklab.cmake.bak	2012-10-15 14:22:22.000000000 +0900
+++ cmake/Piklab.cmake	2012-10-17 22:58:25.000000000 +0900
@@ -1,10 +1,10 @@
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 
 if(WIN32)
-  set(CMAKE_BUILD_TYPE Release)
+#  set(CMAKE_BUILD_TYPE Release)
   set(QT_ONLY 1)
 else(WIN32)
-  set(CMAKE_BUILD_TYPE Debug)
+#  set(CMAKE_BUILD_TYPE Debug)
 endif(WIN32)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
@@ -51,7 +51,7 @@
 
 if(QT_ONLY)
   add_definitions(-DNO_KDE)
-  set(EXE_LIBS ${QT_LIBRARIES}  ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
+  set(EXE_LIBS nokde ${QT_LIBRARIES}  ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
   set(GUI_LIBS nokde_gui ${EXE_LIBS} ${LIBUSB_LIBRARIES})
 else(QT_ONLY)
   find_package(KDE4 REQUIRED)




--- src/CMakeLists.txt.orig	2012-10-15 14:22:47.000000000 +0900
+++ src/CMakeLists.txt	2012-10-18 00:06:13.000000000 +0900
@@ -7,9 +7,9 @@
 add_subdirectory(progs)
 add_subdirectory(piklab-prog)
 add_subdirectory(piklab-test)
-add_subdirectory(dev-utils)
 
 if(NOT QT_ONLY)
+    add_subdirectory(dev-utils)
     add_subdirectory(data)
     add_subdirectory(libgui)
     add_subdirectory(tools)




--- src/common/global/pfile.cpp.orig	2012-10-15 14:22:37.000000000 +0900
+++ src/common/global/pfile.cpp	2012-10-17 18:47:35.000000000 +0900
@@ -99,9 +99,14 @@
 {
   close();
   _tmp.reset(new KTemporaryFile);
+#if defined(NO_KDE)
+  _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
+  _tmp->setAutoRemove(true);
+#else
   if (!_extension.isEmpty()) {
     _tmp->setSuffix("." + _extension);
   }
+#endif
   if (!_tmp->open()) {
     _error = i18n("Could not create temporary file.");
     _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
@@ -149,9 +154,14 @@
     }
 
     _tmp.reset(new KTemporaryFile);
+#if defined(NO_KDE)
+    _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
+    _tmp->setAutoRemove(true);
+#else
     if (!_extension.isEmpty()) {
       _tmp->setSuffix("." + _extension);
     }
+#endif
     if (!_tmp->open()) {
       _error = i18n("Could not create temporary file.");
       _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));




--- src/common/port/hid_port.h.orig	2012-10-15 14:22:38.000000000 +0900
+++ src/common/port/hid_port.h	2012-10-17 22:32:50.000000000 +0900
@@ -9,6 +9,8 @@
 #ifndef HID_PORT_H
 #define HID_PORT_H
 
+#ifdef __linux
+
 #include "port_base.h"
 
 #ifdef Q_OS_UNIX
@@ -57,3 +59,5 @@
 } // namespace
 
 #endif
+
+#endif

Return to bug 174194

Line 0 Link Here

(-)devel/piklab/files/patch-cmake__Piklab.cmkae (+24 lines)
	1	--- cmake/Piklab.cmake.bak 2012-10-15 14:22:22.000000000 +0900
	2	+++ cmake/Piklab.cmake 2012-10-17 22:58:25.000000000 +0900
	3	@@ -1,10 +1,10 @@
	4	#set(CMAKE_VERBOSE_MAKEFILE ON)
	5
	6	if(WIN32)
	7	- set(CMAKE_BUILD_TYPE Release)
	8	+# set(CMAKE_BUILD_TYPE Release)
	9	set(QT_ONLY 1)
	10	else(WIN32)
	11	- set(CMAKE_BUILD_TYPE Debug)
	12	+# set(CMAKE_BUILD_TYPE Debug)
	13	endif(WIN32)
	14
	15	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
	16	@@ -51,7 +51,7 @@
	17
	18	if(QT_ONLY)
	19	add_definitions(-DNO_KDE)
	20	- set(EXE_LIBS ${QT_LIBRARIES} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
	21	+ set(EXE_LIBS nokde ${QT_LIBRARIES} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
	22	set(GUI_LIBS nokde_gui ${EXE_LIBS} ${LIBUSB_LIBRARIES})
	23	else(QT_ONLY)
	24	find_package(KDE4 REQUIRED)

Line 0 Link Here

(-)devel/piklab/files/patch-src__CMakeLists.txt (+13 lines)
	1	--- src/CMakeLists.txt.orig 2012-10-15 14:22:47.000000000 +0900
	2	+++ src/CMakeLists.txt 2012-10-18 00:06:13.000000000 +0900
	3	@@ -7,9 +7,9 @@
	4	add_subdirectory(progs)
	5	add_subdirectory(piklab-prog)
	6	add_subdirectory(piklab-test)
	7	-add_subdirectory(dev-utils)
	8
	9	if(NOT QT_ONLY)
	10	+ add_subdirectory(dev-utils)
	11	add_subdirectory(data)
	12	add_subdirectory(libgui)
	13	add_subdirectory(tools)

Line 0 Link Here

(-)devel/piklab/files/patch-src__common__global__pfile.cpp (+32 lines)
	1	--- src/common/global/pfile.cpp.orig 2012-10-15 14:22:37.000000000 +0900
	2	+++ src/common/global/pfile.cpp 2012-10-17 18:47:35.000000000 +0900
	3	@@ -99,9 +99,14 @@
	4	{
	5	close();
	6	_tmp.reset(new KTemporaryFile);
	7	+#if defined(NO_KDE)
	8	+ _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
	9	+ _tmp->setAutoRemove(true);
	10	+#else
	11	if (!_extension.isEmpty()) {
	12	_tmp->setSuffix("." + _extension);
	13	}
	14	+#endif
	15	if (!_tmp->open()) {
	16	_error = i18n("Could not create temporary file.");
	17	_log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
	18	@@ -149,9 +154,14 @@
	19	}
	20
	21	_tmp.reset(new KTemporaryFile);
	22	+#if defined(NO_KDE)
	23	+ _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
	24	+ _tmp->setAutoRemove(true);
	25	+#else
	26	if (!_extension.isEmpty()) {
	27	_tmp->setSuffix("." + _extension);
	28	}
	29	+#endif
	30	if (!_tmp->open()) {
	31	_error = i18n("Could not create temporary file.");
	32	_log.sorry(_error, i18n("File: %1").arg(_tmp->name()));

Line 0 Link Here

(-)devel/piklab/files/patch-src__common__port__hid_port.h (+17 lines)
	1	--- src/common/port/hid_port.h.orig 2012-10-15 14:22:38.000000000 +0900
	2	+++ src/common/port/hid_port.h 2012-10-17 22:32:50.000000000 +0900
	3	@@ -9,6 +9,8 @@
	4	#ifndef HID_PORT_H
	5	#define HID_PORT_H
	6
	7	+#ifdef __linux
	8	+
	9	#include "port_base.h"
	10
	11	#ifdef Q_OS_UNIX
	12	@@ -57,3 +59,5 @@
	13	} // namespace
	14
	15	#endif
	16	+
	17	+#endif