Bug 182233 - [patch] graphics/eos-movrec: fix build at 10.x and use new LIB_DEPENDS syntax
Summary: [patch] graphics/eos-movrec: fix build at 10.x and use new LIB_DEPENDS syntax
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Boris Samorodov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-09-19 20:30 UTC by Boris Samorodov
Modified: 2013-09-23 08:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.02 KB, patch)
2013-09-19 20:30 UTC, Boris Samorodov
no flags Details | Diff
eos-movrec.diff (4.30 KB, patch)
2013-09-21 00:08 UTC, Rusmir Dusko
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Boris Samorodov 2013-09-19 20:30:00 UTC
The ports does not build at a fresh CURRENT:
-----
[ 15%] Building CXX object CMakeFiles/eos_movrec.dir/main.cpp.o
/usr/bin/c++   -DGPHOTO2=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_DEBUG -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -O2 -pipe -fno-strict-aliasing -fexceptions -O2 -pipe -fno-strict-aliasing -DNDEBUG -isystem /usr/local/include/qt4 -isystem /usr/local/include/qt4/QtGui -isystem /usr/local/include/qt4/QtCore -I/usr/local/share/qt4/mkspecs/default -I/wrkdirs/usr/ports/graphics/eos-movrec/work/eos-movrec-0.3.1_beta -I/usr/local/include/gphoto2 -I/usr/local/include -o CMakeFiles/eos_movrec.dir/main.cpp.o -c /wrkdirs/usr/ports/graphics/eos-movrec/work/eos-movrec-0.3.1_beta/main.cpp
/wrkdirs/usr/ports/graphics/eos-movrec/work/eos-movrec-0.3.1_beta/main.cpp:30:12: error: use of undeclared identifier 'LC_MESSAGES'
        setlocale(LC_MESSAGES, "POSIX");
                  ^
1 error generated.
*** Error code 1
-----

Fix: . fix build at 10.x;
. use new LIB_DEPENDS syntax.

Patch attached with submission follows:
How-To-Repeat: . install fresh CURRENT;
. try to build graphics/eos-movrec.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-09-19 20:30:07 UTC
Maintainer of graphics/eos-movrec,

Please note that PR ports/182233 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182233

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-09-19 20:30:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Boris Samorodov freebsd_committer freebsd_triage 2013-09-19 20:53:58 UTC
Responsible Changed
From-To: freebsd-ports-bugs->bsam

Take my PR.
Comment 4 Rusmir Dusko freebsd_committer freebsd_triage 2013-09-21 00:08:05 UTC
- Update to 0.3.2_beta
- Change maintainer email gmx.ch --> FreeBSD.org
- Use the new format for LIB_DEPENDS
- Add USE_DOS2UNIX
- Change dependencies for QT4
- Use pkg-plist instead of PLIST_FILES and PLIST_DIRS
- Change desktop entry and icons
- Add patch, fix build at 10.x


Build log

https://redports.org/buildarchive/20130920141300-19769/
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-09-21 07:13:50 UTC
Author: bsam
Date: Sat Sep 21 06:13:38 2013
New Revision: 327791
URL: http://svnweb.freebsd.org/changeset/ports/327791

Log:
  - Update to 0.3.2_beta
  - Change maintainer email gmx.ch --> FreeBSD.org
  - Use the new format for LIB_DEPENDS  [1]
  - Add USE_DOS2UNIX
  - Change dependencies for QT4
  - Use pkg-plist instead of PLIST_FILES and PLIST_DIRS
  - Change desktop entry and icons
  - Add patch, fix build at 10.x  [1]
  
  PR:		ports/182233  [1]
  Submitted by:	bsam (me)  [1]
  Final patch by:	nemysis (maintainer)

Added:
  head/graphics/eos-movrec/files/
  head/graphics/eos-movrec/files/patch-main.cpp   (contents, props changed)
Modified:
  head/graphics/eos-movrec/Makefile
  head/graphics/eos-movrec/distinfo

Modified: head/graphics/eos-movrec/Makefile
==============================================================================
--- head/graphics/eos-movrec/Makefile	Sat Sep 21 05:59:24 2013	(r327790)
+++ head/graphics/eos-movrec/Makefile	Sat Sep 21 06:13:38 2013	(r327791)
@@ -2,39 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	eos-movrec
-DISTVERSION=	0.3.1_beta
-PORTREVISION=	4
+DISTVERSION=	0.3.2_beta
 CATEGORIES=	graphics multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.3_beta/ \
-		SF/nemysisfreebsdp/:icons
-DISTFILES=	${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX} \
-		${PORTNAME}.png:icons
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Capture short movies with Canon DSLR camera
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gphoto2:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 
 USE_BZIP2=	yes
 USES=		cmake pkgconfig
-USE_QT4=	qmake_build moc_build rcc_build uic_build gui
+USE_DOS2UNIX=	*.pro *.cpp *.h
+USE_QT4=	corelib dbus declarative designer gui help iconengines imageformats \
+		moc_build multimedia network opengl phonon qmake_build qt3support \
+		rcc_build script scripttools sql qt3support uic_build webkit xml xmlpatterns
 
-PLIST_FILES=	bin/eos_movrec \
-		share/pixmaps/${PORTNAME}.png
+INSTALLS_ICONS=	yes
+ICON_SIZES=	16x16 32x32 128x128 256x256 512x512
 
-DESKTOP_ENTRIES=	"eos_movrec" "EOS Camera Movie Recorder" \
-			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-			"eos_movrec" "Graphics;Photography;Qt;" false
+DESKTOP_ENTRIES="EOS Camera Movie Recorder" "${COMMENT}" "${PORTNAME}" \
+		"eos_movrec" "Graphics;Photography;Qt;" false
 
 NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's,GLIBC,${OPSYS},' ${WRKSRC}/os_api.h
+	@${REINPLACE_CMD} -e 's|GLIBC|${OPSYS}|' ${WRKSRC}/os_api.h
+.for s in 16 32 128 256 512
+	@cd ${WRKSRC}/mac.icons && \
+		${MV} ${s}.png ${PORTNAME}_${s}x${s}.png
+.endfor
 
 post-install:
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+.for s in ${ICON_SIZES}
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	${INSTALL_DATA} ${WRKSRC}/mac.icons/${PORTNAME}_${s}.png \
+		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+.endfor
+	${LN} -sf ${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>

Modified: head/graphics/eos-movrec/distinfo
==============================================================================
--- head/graphics/eos-movrec/distinfo	Sat Sep 21 05:59:24 2013	(r327790)
+++ head/graphics/eos-movrec/distinfo	Sat Sep 21 06:13:38 2013	(r327791)
@@ -1,4 +1,2 @@
-SHA256 (eos-movrec/eos-movrec-0.3.1_beta-src.tar.bz2) = 044cf8b6428d66d6d03c3df53103f985e5b669cad3c8f78a94f9ef308259deea
-SIZE (eos-movrec/eos-movrec-0.3.1_beta-src.tar.bz2) = 3955037
-SHA256 (eos-movrec/eos-movrec.png) = ad7bd2b870b2b63d4868f49c34b8ddf5e801f3c2e878bba455817b66b53ecd85
-SIZE (eos-movrec/eos-movrec.png) = 1085
+SHA256 (eos-movrec-0.3.2_beta.tar.bz2) = a793e1961a1e1a701932415d653040bb27500daea5f0e65bf4c06e47cd94fe0f
+SIZE (eos-movrec-0.3.2_beta.tar.bz2) = 3828236

Added: head/graphics/eos-movrec/files/patch-main.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/eos-movrec/files/patch-main.cpp	Sat Sep 21 06:13:38 2013	(r327791)
@@ -0,0 +1,10 @@
+--- main.cpp.orig	2013-09-19 22:25:36.000000000 +0400
++++ main.cpp	2013-09-19 22:26:10.000000000 +0400
+@@ -19,6 +19,7 @@
+  ***************************************************************************/
+ 
+ #include <qapplication.h>
++#include <clocale>
+ #include "mainwnd.h"
+ 
+ int main(int argc, char **argv)
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Boris Samorodov freebsd_committer freebsd_triage 2013-09-21 07:14:15 UTC
State Changed
From-To: feedback->closed

Committed, thanks! ;-)
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-09-23 08:02:58 UTC
Author: bsam
Date: Mon Sep 23 07:02:52 2013
New Revision: 327949
URL: http://svnweb.freebsd.org/changeset/ports/327949

Log:
  Add pkg-plist forgotten while committing r327791.
  
  PR:		ports/182233
  Submitted by:	bsam (me)
  Patch by:	nemysis
  Pointed out by:	danfe
  Pointyhat to:	bsam (me)

Added:
  head/graphics/eos-movrec/pkg-plist   (contents, props changed)

Added: head/graphics/eos-movrec/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/eos-movrec/pkg-plist	Mon Sep 23 07:02:52 2013	(r327949)
@@ -0,0 +1,11 @@
+bin/eos_movrec
+share/icons/hicolor/128x128/apps/eos-movrec.png
+share/icons/hicolor/16x16/apps/eos-movrec.png
+share/icons/hicolor/256x256/apps/eos-movrec.png
+share/icons/hicolor/32x32/apps/eos-movrec.png
+share/icons/hicolor/512x512/apps/eos-movrec.png
+share/pixmaps/eos-movrec.png
+@dirrmtry share/icons/hicolor/512x512/apps
+@dirrmtry share/icons/hicolor/512x512
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"