- Update to version 0.16.2.

PR:		ports/174194
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
This commit is contained in:
Marcelo Araujo 2013-02-04 10:00:43 +00:00
parent efb509610b
commit 38ef3b0f56
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=311596
5 changed files with 69 additions and 12 deletions

View file

@ -1,12 +1,8 @@
# New ports collection makefile for: piklab
# Date created: 2007-11-19
# Whom: Michael Nottebrock <lofi@kiste>
#
# Created by: Michael Nottebrock <lofi@kiste>
# $FreeBSD$
#
PORTNAME= piklab
PORTVERSION= 0.16.1
PORTVERSION= 0.16.2
CATEGORIES= devel
MASTER_SITES= SF
@ -14,14 +10,16 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= KDE IDE for microcontroller development
LICENSE= GPLv2 # (or later)
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= KDE4
OPTIONS_DEFAULT=KDE4
USE_BZIP2= yes
USE_DOS2UNIX= Piklab.cmake
USE_QT4= corelib gui qt3support qtestlib xml \
moc_build qmake_build rcc_build uic_build
USE_NCURSES= yes
USE_READLINE= yes
USE_GETTEXT= yes
USE_CMAKE= yes
MAKE_JOBS_SAFE= yes
@ -55,9 +53,6 @@ post-patch:
@${REINPLACE_CMD} -e \
'/man/s|^|#| ; \
/install/s|^|#|' ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e \
'/CMAKE_BUILD_TYPE/s|^|#| ; \
/KDE4/s|INCLUDE_DIRS|INCLUDES|' ${WRKSRC}/cmake/Piklab.cmake
post-install:
${INSTALL_MAN} ${WRKSRC}/man/piklab-*.1 ${MANPREFIX}/man/man1

View file

@ -1,2 +1,2 @@
SHA256 (piklab-0.16.1.tar.bz2) = 80db24022de47a7377412912b1fd186d6ad08fafa042bed17b49ada2de56004d
SIZE (piklab-0.16.1.tar.bz2) = 972681
SHA256 (piklab-0.16.2.tar.bz2) = 51de9edda8edb9d2e9d07ed1c479b83b87eb6fb17c85717477f05fac03a5740e
SIZE (piklab-0.16.2.tar.bz2) = 1036644

View file

@ -0,0 +1,13 @@
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -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)

View file

@ -0,0 +1,32 @@
--- src/common/global/pfile.cpp.orig
+++ src/common/global/pfile.cpp
@@ -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()));

View file

@ -0,0 +1,17 @@
--- src/common/port/hid_port.h.orig
+++ src/common/port/hid_port.h
@@ -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