[Midnightbsd-cvs] mports [19905] trunk/graphics: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Aug 20 21:40:04 EDT 2015 

Revision: 19905
          http://svnweb.midnightbsd.org/mports/?rev=19905
Author:   laffer1
Date:     2015-08-20 21:40:04 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/graphics/gnustep-slideshow/Makefile
    trunk/graphics/gnustep-slideshow/distinfo
    trunk/graphics/gnustep-slideshow/pkg-plist
    trunk/graphics/gnustep-slideshowkit/Makefile
    trunk/graphics/gnustep-slideshowkit/distinfo
    trunk/graphics/gnustep-slideshowkit/pkg-plist

Added Paths:
-----------
    trunk/graphics/gnustep-slideshow/files/patch-Controller.m
    trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c

Modified: trunk/graphics/gnustep-slideshow/Makefile
===================================================================
--- trunk/graphics/gnustep-slideshow/Makefile	2015-08-21 01:36:32 UTC (rev 19904)
+++ trunk/graphics/gnustep-slideshow/Makefile	2015-08-21 01:40:04 UTC (rev 19905)
@@ -2,7 +2,7 @@
 
 PORTNAME=	slideshow
 PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 PKGNAMEPREFIX=	gnustep-
@@ -12,13 +12,12 @@
 COMMENT=	SlideShow Viewer
 LICENSE=	gpl2
 
-USE_BZIP2=	yes
-USE_GNUSTEP=	yes
-USE_GNUSTEP_BACK=	yes
-USE_GNUSTEP_BUILD=	yes
-USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LOCAL_LIBS+=	SlideShow:${SLIDESHOWKIT_PORT}
+LICENSE=	GPLv2
 
-SLIDESHOWKIT_PORT?=	graphics/gnustep-slideshowkit
+USES=		tar:bzip2 gnustep
+USE_GNUSTEP=	back build
+LIB_DEPENDS=	libSlideShow.so:${PORTSDIR}/graphics/gnustep-slideshowkit
 
+OBJCFLAGS+=	-Dsel_eq=sel_isEqual
+
 .include <bsd.port.mk>

Modified: trunk/graphics/gnustep-slideshow/distinfo
===================================================================
--- trunk/graphics/gnustep-slideshow/distinfo	2015-08-21 01:36:32 UTC (rev 19904)
+++ trunk/graphics/gnustep-slideshow/distinfo	2015-08-21 01:40:04 UTC (rev 19905)
@@ -1,3 +1,2 @@
 SHA256 (SlideShow-0.3.5.tar.bz2) = 3973dbe421441d64b1546a410317777a67a23f16b41569707e5dc057a95af61a
-RMD160 (SlideShow-0.3.5.tar.bz2) = 3bfde93e83cce5207e85e24e2e9832bbc2555b50
 SIZE (SlideShow-0.3.5.tar.bz2) = 39478

Added: trunk/graphics/gnustep-slideshow/files/patch-Controller.m
===================================================================
--- trunk/graphics/gnustep-slideshow/files/patch-Controller.m	                        (rev 0)
+++ trunk/graphics/gnustep-slideshow/files/patch-Controller.m	2015-08-21 01:40:04 UTC (rev 19905)
@@ -0,0 +1,41 @@
+--- Controller.m.orig	2013-08-20 15:46:28.000000000 +0000
++++ Controller.m	2013-08-20 15:46:48.000000000 +0000
+@@ -1021,32 +1021,32 @@
+ {
+   SEL action = [menuItem action];
+   
+-  if ( sel_eq(action, at selector(removeImages:)) ) 
++  if ( sel_isEqual(action, at selector(removeImages:)) ) 
+     {
+       if ((  [_backend count] == 0 ) || ( ! [browser selectedCells] ) )
+ 	return NO;
+     }
+-  if ( sel_eq(action, at selector(showNextImage:)) )
++  if ( sel_isEqual(action, at selector(showNextImage:)) )
+     {
+       if (  (  ( _current + 1 ) == [_backend count] ) || ( [_backend count] == 0 )  )
+ 	return NO;
+     }
+-  else if ( sel_eq(action, at selector(showPreviousImage:)) )
++  else if ( sel_isEqual(action, at selector(showPreviousImage:)) )
+     {
+       if ( [_backend count] == 0 ) 
+ 	return NO;
+     }
+-  else if ( sel_eq(action, at selector(fullscreenAction:)) )
++  else if ( sel_isEqual(action, at selector(fullscreenAction:)) )
+     {
+       if ( [_backend count]  == 0 ) 
+ 	return NO;
+     }
+-  else if ( sel_eq(action, at selector(addMarkAction:)) ) 
++  else if ( sel_isEqual(action, at selector(addMarkAction:)) ) 
+     {
+       if ( (  [self showState] == ShowOnlyMarked ) ||  ([_backend count] == 0 ) )
+ 	return NO;
+     }
+-  else if ( sel_eq(action, at selector(showMarkAction:)) ) 
++  else if ( sel_isEqual(action, at selector(showMarkAction:)) ) 
+     {
+       if ( [_backend count] == 0  )
+ 	return NO;


Property changes on: trunk/graphics/gnustep-slideshow/files/patch-Controller.m
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/gnustep-slideshow/pkg-plist
===================================================================
--- trunk/graphics/gnustep-slideshow/pkg-plist	2015-08-21 01:36:32 UTC (rev 19904)
+++ trunk/graphics/gnustep-slideshow/pkg-plist	2015-08-21 01:40:04 UTC (rev 19905)
@@ -15,8 +15,3 @@
 GNUstep/Local/Applications/SlideShow.app/SlideShow
 GNUstep/Local/Applications/SlideShow.app/stamp.make
 GNUstep/Local/Tools/SlideShow
- at dirrm GNUstep/Local/Applications/SlideShow.app/Resources/English.lproj/Preferences.gorm
- at dirrm GNUstep/Local/Applications/SlideShow.app/Resources/English.lproj/Main.gorm
- at dirrm GNUstep/Local/Applications/SlideShow.app/Resources/English.lproj
- at dirrm GNUstep/Local/Applications/SlideShow.app/Resources
- at dirrm GNUstep/Local/Applications/SlideShow.app

Modified: trunk/graphics/gnustep-slideshowkit/Makefile
===================================================================
--- trunk/graphics/gnustep-slideshowkit/Makefile	2015-08-21 01:36:32 UTC (rev 19904)
+++ trunk/graphics/gnustep-slideshowkit/Makefile	2015-08-21 01:40:04 UTC (rev 19905)
@@ -2,7 +2,7 @@
 
 PORTNAME=	slideshowkit
 PORTVERSION=	0.0.1
-PORTREVISION=	20050209
+PORTREVISION=	20050211
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	http://download.gna.org/gsimageapps/
 PKGNAMEPREFIX=	gnustep-
@@ -12,10 +12,11 @@
 COMMENT=	SlideShow Framework
 LICENSE=	gpl2
 
-USE_GNUSTEP=	yes
-USE_GNUSTEP_BACK=	yes
-USE_GNUSTEP_BUILD=	yes
-USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
+USES=		gnustep
+USE_GNUSTEP=	back build
+USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
+post-install:
+	${STRIP_CMD} ${PREFIX}/GNUstep/Local/Library/Libraries/libSlideShow.so
+
 .include <bsd.port.mk>

Modified: trunk/graphics/gnustep-slideshowkit/distinfo
===================================================================
--- trunk/graphics/gnustep-slideshowkit/distinfo	2015-08-21 01:36:32 UTC (rev 19904)
+++ trunk/graphics/gnustep-slideshowkit/distinfo	2015-08-21 01:40:04 UTC (rev 19905)
@@ -1,3 +1,2 @@
 SHA256 (SlideShowKit-0.0.1.tar.gz) = 4d1ff64f5af939ffbaa2a55da5758974125b4c2f3c3a8b21a55db07e89cc291c
-RMD160 (SlideShowKit-0.0.1.tar.gz) = efbfbbfad753de49b57df6fe1d88c5fea00c3acd
 SIZE (SlideShowKit-0.0.1.tar.gz) = 2540

Modified: trunk/graphics/gnustep-slideshowkit/pkg-plist
===================================================================
--- trunk/graphics/gnustep-slideshowkit/pkg-plist	2015-08-21 01:36:32 UTC (rev 19904)
+++ trunk/graphics/gnustep-slideshowkit/pkg-plist	2015-08-21 01:40:04 UTC (rev 19905)
@@ -3,4 +3,3 @@
 GNUstep/Local/Library/Libraries/libSlideShow.so.%%VERSION%%
 GNUstep/Local/Library/Headers/SlideShow/SlideShow.h
 GNUstep/Local/Library/Headers/SlideShow/SlideShowWindow.h
- at dirrm GNUstep/Local/Library/Headers/SlideShow

Added: trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c
===================================================================
--- trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c	                        (rev 0)
+++ trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c	2015-08-21 01:40:04 UTC (rev 19905)
@@ -0,0 +1,13 @@
+--- libgphoto2_port/libusb1/libusb1.c.orig	2015-06-15 20:13:54 UTC
++++ libgphoto2_port/libusb1/libusb1.c
+@@ -66,6 +66,10 @@
+ 	}\
+ } while(0)
+ 
++#ifndef LIBUSB_CALL
++#define LIBUSB_CALL
++#endif
++
+ #ifndef HAVE_LIBUSB_STRERROR
+ static const char *libusb_strerror(int r)
+ {


Property changes on: trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list