Attachment #164267 for bug #205339

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




LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
		libjasper.so:${PORTSDIR}/graphics/jasper \
		libpcre.so:${PORTSDIR}/devel/pcre \
		libavahi-core.so:${PORTSDIR}/net/avahi-app \
		libenchant.so:${PORTSDIR}/textproc/enchant \
		libgif.so:${PORTSDIR}/graphics/giflib \
		libpng.so:${PORTSDIR}/graphics/png \
		libhal.so:${PORTSDIR}/sysutils/hal \
		libqca.so:${PORTSDIR}/devel/qca \
		libHUpnp.so:${PORTSDIR}/net/hupnp \
		libpolkit-qt-core-1.so:${PORTSDIR}/sysutils/polkit-qt \
		libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \
		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee

		-DWITH_ASPELL:BOOL=Off \
		-DWITH_HSPELL:BOOL=Off \
		-DWITH_UDev:BOOL=Off \
		-DHUPNP_ENABLED:BOOL=On \
		-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \
		-DKDE_DEFAULT_HOME:STRING=".kde4"


		kio/proxytype.pl \
		kioslave/http/kcookiejar/kcookiescfg.pl

OPTIONS_DEFINE=	AVAHI UPNP
OPTIONS_DEFAULT=AVAHI

AVAHI_LIB_DEPENDS=	libavahi-core.so:${PORTSDIR}/net/avahi-app

UPNP_DESC=	UPnP backend for Solid (WARNING: Unstable)
UPNP_LIB_DEPENDS=	libHUpnp.so:${PORTSDIR}/net/hupnp
UPNP_CMAKE_ON=	-DHUPNP_ENABLED:BOOL=On

post-patch:
	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
		${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \




--- ./solid/solid/managerbase.cpp.orig	2012-04-17 23:58:05.745260976 +0200
+++ ./solid/solid/managerbase.cpp	2012-04-18 00:00:48.605183174 +0200
@@ -90,7 +90,11 @@
 #        endif
 
 #        if defined (HUPNP_FOUND)
-            m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
+            bool solidUPnPEnabled
+                = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
+            if (solidUPnPEnabled) {
+                m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
+            }
 #        endif
     }
 }




======================================================================

Due to severe instability, the Solid UPnP backend was disabled. Thus,
you will not get notifications about networked shares in the device
notifier. The UPnP functionality can be re-enabled by setting the
SOLID_UPNP environment variable:

$ cat > ~/.kde4/env/upnp.sh << EOF
SOLID_UPNP=1
export SOLID_UPNP
EOF
$ chmod +x ~/.kde4/env/upnp.sh

======================================================================

Return to bug 205339

Lines 14-26 Link Here

(-)x11/kdelibs4/Makefile (-3 / +9 lines)
14	LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \	14	LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
15	libjasper.so:${PORTSDIR}/graphics/jasper \	15	libjasper.so:${PORTSDIR}/graphics/jasper \
16	libpcre.so:${PORTSDIR}/devel/pcre \	16	libpcre.so:${PORTSDIR}/devel/pcre \
17	libavahi-core.so:${PORTSDIR}/net/avahi-app \
18	libenchant.so:${PORTSDIR}/textproc/enchant \	17	libenchant.so:${PORTSDIR}/textproc/enchant \
19	libgif.so:${PORTSDIR}/graphics/giflib \	18	libgif.so:${PORTSDIR}/graphics/giflib \
20	libpng.so:${PORTSDIR}/graphics/png \	19	libpng.so:${PORTSDIR}/graphics/png \
21	libhal.so:${PORTSDIR}/sysutils/hal \	20	libhal.so:${PORTSDIR}/sysutils/hal \
22	libqca.so:${PORTSDIR}/devel/qca \	21	libqca.so:${PORTSDIR}/devel/qca \
23	libHUpnp.so:${PORTSDIR}/net/hupnp \
24	libpolkit-qt-core-1.so:${PORTSDIR}/sysutils/polkit-qt \	22	libpolkit-qt-core-1.so:${PORTSDIR}/sysutils/polkit-qt \
25	libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \	23	libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \
26	libgrantlee_gui.so:${PORTSDIR}/devel/grantlee	24	libgrantlee_gui.so:${PORTSDIR}/devel/grantlee
Lines 52-58 Link Here
52	-DWITH_ASPELL:BOOL=Off \	50	-DWITH_ASPELL:BOOL=Off \
53	-DWITH_HSPELL:BOOL=Off \	51	-DWITH_HSPELL:BOOL=Off \
54	-DWITH_UDev:BOOL=Off \	52	-DWITH_UDev:BOOL=Off \
55	-DHUPNP_ENABLED:BOOL=On \
56	-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \	53	-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \
57	-DKDE_DEFAULT_HOME:STRING=".kde4"	54	-DKDE_DEFAULT_HOME:STRING=".kde4"
58		55
Lines 64-69 Link Here
64	kio/proxytype.pl \	61	kio/proxytype.pl \
65	kioslave/http/kcookiejar/kcookiescfg.pl	62	kioslave/http/kcookiejar/kcookiescfg.pl
66		63
		64	OPTIONS_DEFINE= AVAHI UPNP
		65	OPTIONS_DEFAULT=AVAHI
		66
		67	AVAHI_LIB_DEPENDS= libavahi-core.so:${PORTSDIR}/net/avahi-app
		68
		69	UPNP_DESC= UPnP backend for Solid (WARNING: Unstable)
		70	UPNP_LIB_DEPENDS= libHUpnp.so:${PORTSDIR}/net/hupnp
		71	UPNP_CMAKE_ON= -DHUPNP_ENABLED:BOOL=On
		72
67	post-patch:	73	post-patch:
68	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \	74	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
69	${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \	75	${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \

Lines 1-15 Link Here

(-)x11/kdelibs4/files/patch-solid__solid__managerbase.cpp (-15 lines)
1	--- ./solid/solid/managerbase.cpp.orig 2012-04-17 23:58:05.745260976 +0200
2	+++ ./solid/solid/managerbase.cpp 2012-04-18 00:00:48.605183174 +0200
3	@@ -90,7 +90,11 @@
4	# endif
5
6	# if defined (HUPNP_FOUND)
7	- m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
8	+ bool solidUPnPEnabled
9	+ = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
10	+ if (solidUPnPEnabled) {
11	+ m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
12	+ }
13	# endif
14	}
15	}

Lines 1-14 Link Here

(-)x11/kdelibs4/pkg-message (-14 lines)
1	======================================================================
2
3	Due to severe instability, the Solid UPnP backend was disabled. Thus,
4	you will not get notifications about networked shares in the device
5	notifier. The UPnP functionality can be re-enabled by setting the
6	SOLID_UPNP environment variable:
7
8	$ cat > ~/.kde4/env/upnp.sh << EOF
9	SOLID_UPNP=1
10	export SOLID_UPNP
11	EOF
12	$ chmod +x ~/.kde4/env/upnp.sh
13
14	======================================================================