Attachment #247696 for bug #276370

View | Details | Raw Unified | Return to bug 276370
Collapse All | Expand All




PORTNAME=	idesk
PORTVERSION=	0.7.5
PORTREVISION=	12
CATEGORIES=	x11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}


COMMENT=	Place launch icons and background directly on your desktop
WWW=		https://idesk.sourceforge.net

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
		libXft.so:x11-fonts/libXft

USES=		gmake pkgconfig tar:bzip2 xorg
USE_XORG=	ice sm x11

GNU_CONFIGURE=	yes

MAKE_ARGS=	cc="${CXX}" \
		cflags="${CXXFLAGS}"
SUB_FILES=	pkg-message
PLIST_FILES=	bin/${PORTNAME}
PORTDOCS=	README

OPTIONS_DEFINE=		DOCS SHAPE SN
OPTIONS_DEFAULT=	SHAPE

SHAPE_DESC=	Support of XShape extension
SN_DESC=	Startup notification support

SHAPE_USE=		XORG=xext
SHAPE_CONFIGURE_ENABLE=	shape

SN_LIB_DEPENDS=		libstartup-notification-1.so:x11/startup-notification
SN_CONFIGURE_ON=	--enable-libsn

do-install:




work around removed imlib2-config

Index: configure
--- configure.orig	2005-11-10 23:31:38 UTC
+++ configure
@@ -7030,13 +7030,8 @@ echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
   echo "$as_me:$LINENO: checking for imlib2" >&5
 echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
   no_imlib2=""
-  if test "$IMLIB2_CONFIG" = "no" ; then
-     no_imlib2=yes
-  else
-     IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`"
-     IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
-
-  fi
+     IMLIB2_CFLAGS="`pkg-config --cflags imlib2`"
+     IMLIB2_LIBS="`pkg-config --libs imlib2`"
   if test "x$no_imlib2" = x ; then
      echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -7067,8 +7062,8 @@ echo "$as_me: error: Cannot find imlib2: Is imlib2-con
 
 
 
-IMLIB_LIBS=`imlib2-config --libs`
-IMLIB_CFLAGS=`imlib2-config --cflags`
+IMLIB_LIBS=`pkg-config --libs imlib2`
+IMLIB_CFLAGS=`pkg-config --cflags imlib2`
 
 
 




--- src/DesktopConfig.cpp.orig	2005-11-10 23:07:58 UTC
+++ src/DesktopConfig.cpp
@@ -24,6 +24,7 @@
 
 #include "DesktopConfig.h"
 #include "Util.h"
+#include "sys/stat.h"
 
 //the initilizer list just sets the program defaults for non-necessary options
 DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
+ #include "sys/stat.h"
  
  //the initilizer list just sets the program defaults for non-necessary options
  DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
                               AbstractConfig(ideskrcFile)
  {

Lines 1-5 Link Here

(-)b/x11/idesk/files/patch-src_Timer.cpp (-2 / +2 lines)
1	--- src/Timer.cpp.orig Mon Aug 15 07:26:39 2005	1	--- src/Timer.cpp.orig 2005-08-15 05:26:39 UTC
2	+++ src/Timer.cpp Tue Sep 13 23:14:32 2005	2	+++ src/Timer.cpp
3	@@ -26,6 +26,7 @@	3	@@ -26,6 +26,7 @@
4	#include "Database.h"	4	#include "Database.h"
5	#include <X11/Xlib.h>	5	#include <X11/Xlib.h>




--- src/XImlib2Background.cpp.orig	2005-11-10 23:08:55 UTC
+++ src/XImlib2Background.cpp
@@ -26,6 +26,7 @@
 #include "Database.h"
 #include "XImlib2Background.h"
 #include <X11/Xatom.h>
+#include "sys/stat.h"
 
 XImlib2Background::XImlib2Background(AbstractContainer * c, AbstractConfig * con): TimerControl(), 
                                                     container(c), config(con),delay(0), mode(0),  save(NULL), show(NULL),
+ #include "sys/stat.h"
  
  XImlib2Background::XImlib2Background(AbstractContainer * c, AbstractConfig * con): TimerControl(), 
                                                      container(c), config(con),delay(0), mode(0),  save(NULL), show(NULL),
  						    srctime(0), images(""), directory(""), OneShot(false)
  {

Return to bug 276370

Lines 1-6 Link Here

(-)b/x11/idesk/Makefile (-12 / +20 lines)
1	PORTNAME= idesk	1	PORTNAME= idesk
2	PORTVERSION= 0.7.5	2	PORTVERSION= 0.7.5
3	PORTREVISION= 11	3	PORTREVISION= 12
4	CATEGORIES= x11	4	CATEGORIES= x11
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
6		6
Lines 8-32 MAINTAINER= acm@FreeBSD.org Link Here
8	COMMENT= Place launch icons and background directly on your desktop	8	COMMENT= Place launch icons and background directly on your desktop
9	WWW= https://idesk.sourceforge.net	9	WWW= https://idesk.sourceforge.net
10		10
11	LIB_DEPENDS= libXft.so:x11-fonts/libXft \	11	LICENSE= BSD3CLAUSE
12	libImlib2.so:graphics/imlib2	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	GNU_CONFIGURE= yes	14	LIB_DEPENDS= libImlib2.so:graphics/imlib2 \
15	USES= gmake pkgconfig tar:bzip2	15	libXft.so:x11-fonts/libXft
16		16
17	OPTIONS_DEFINE= SHAPE SN DOCS	17	USES= gmake pkgconfig tar:bzip2 xorg
18	SHAPE_DESC= Support of XShape extension	18	USE_XORG= ice sm x11
19	SN_DESC= Startup notification support	19
20	OPTIONS_DEFAULT= SHAPE	20	GNU_CONFIGURE= yes
21		21
22	CXXFLAGS+= `imlib2-config --cflags` `freetype-config --cflags`	22	MAKE_ARGS= cc="${CXX}" \
23	MAKE_ARGS= cc="${CXX}" cflags="${CXXFLAGS}"	23	cflags="${CXXFLAGS}"
24	SUB_FILES= pkg-message	24	SUB_FILES= pkg-message
25	PLIST_FILES= bin/${PORTNAME}	25	PLIST_FILES= bin/${PORTNAME}
26	PORTDOCS= README	26	PORTDOCS= README
27		27
		28	OPTIONS_DEFINE= DOCS SHAPE SN
		29	OPTIONS_DEFAULT= SHAPE
		30
		31	SHAPE_DESC= Support of XShape extension
		32	SN_DESC= Startup notification support
		33
		34	SHAPE_USE= XORG=xext
28	SHAPE_CONFIGURE_ENABLE= shape	35	SHAPE_CONFIGURE_ENABLE= shape
29	SN_LIB_DEPENDS= libstartup-notification.so:x11/startup-notification	36
		37	SN_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
30	SN_CONFIGURE_ON= --enable-libsn	38	SN_CONFIGURE_ON= --enable-libsn
31		39
32	do-install:	40	do-install:

Added Link Here

(-)b/x11/idesk/files/patch-configure (+32 lines)
1	work around removed imlib2-config
2
3	Index: configure
4	--- configure.orig 2005-11-10 23:31:38 UTC
5	+++ configure
6	@@ -7030,13 +7030,8 @@ echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
7	echo "$as_me:$LINENO: checking for imlib2" >&5
8	echo $ECHO_N "checking for imlib2... $ECHO_C" >&6
9	no_imlib2=""
10	- if test "$IMLIB2_CONFIG" = "no" ; then
11	- no_imlib2=yes
12	- else
13	- IMLIB2_CFLAGS="`$IMLIB2_CONFIG $imlib2_config_args --cflags`"
14	- IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
15	-
16	- fi
17	+ IMLIB2_CFLAGS="`pkg-config --cflags imlib2`"
18	+ IMLIB2_LIBS="`pkg-config --libs imlib2`"
19	if test "x$no_imlib2" = x ; then
20	echo "$as_me:$LINENO: result: yes" >&5
21	echo "${ECHO_T}yes" >&6
22	@@ -7067,8 +7062,8 @@ echo "$as_me: error: Cannot find imlib2: Is imlib2-con
23
24
25
26	-IMLIB_LIBS=`imlib2-config --libs`
27	-IMLIB_CFLAGS=`imlib2-config --cflags`
28	+IMLIB_LIBS=`pkg-config --libs imlib2`
29	+IMLIB_CFLAGS=`pkg-config --cflags imlib2`
30
31
32

Lines 1-16 Link Here

(-)b/x11/idesk/files/patch-src_DesktopConfig.cpp (-16 / +10 lines)
1	*** src/DesktopConfig.cpp.orig Mon Sep 5 21:03:05 2005	1	--- src/DesktopConfig.cpp.orig 2005-11-10 23:07:58 UTC
2	--- src/DesktopConfig.cpp Mon Sep 12 22:38:55 2005	2	+++ src/DesktopConfig.cpp
3	***************	3	@@ -24,6 +24,7 @@
4	* 22,31 **	4
5	--- 22,32 ----	5	#include "DesktopConfig.h"
6	* (See the included file COPYING / BSD )	6	#include "Util.h"
7	*/	7	+#include "sys/stat.h"
8		8
9	#include "DesktopConfig.h"	9	//the initilizer list just sets the program defaults for non-necessary options
10	#include "Util.h"	10	DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
11	+ #include "sys/stat.h"
12
13	//the initilizer list just sets the program defaults for non-necessary options
14	DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
15	AbstractConfig(ideskrcFile)
16	{

Lines 1-16 Link Here

(-)b/x11/idesk/files/patch-src_XImlib2Background.cpp (-16 / +10 lines)
1	*** src/XImlib2Background.cpp.orig Tue Sep 6 01:03:34 2005	1	--- src/XImlib2Background.cpp.orig 2005-11-10 23:08:55 UTC
2	--- src/XImlib2Background.cpp Mon Sep 12 22:39:11 2005	2	+++ src/XImlib2Background.cpp
3	***************	3	@@ -26,6 +26,7 @@
4	* 23,32 **	4	#include "Database.h"
5	--- 23,33 ----	5	#include "XImlib2Background.h"
6	*/	6	#include <X11/Xatom.h>
7		7	+#include "sys/stat.h"
8	#include "Database.h"	8
9	#include "XImlib2Background.h"	9	XImlib2Background::XImlib2Background(AbstractContainer * c, AbstractConfig * con): TimerControl(),
10	#include <X11/Xatom.h>	10	container(c), config(con),delay(0), mode(0), save(NULL), show(NULL),
11	+ #include "sys/stat.h"
12
13	XImlib2Background::XImlib2Background(AbstractContainer * c, AbstractConfig * con): TimerControl(),
14	container(c), config(con),delay(0), mode(0), save(NULL), show(NULL),
15	srctime(0), images(""), directory(""), OneShot(false)
16	{