Attachment 149578 Details for Bug 195121 – rename, v3

[patch] rename, v3

gdkpixbuf2.diff (text/plain), 2.72 KB, created by Jan Beich on 2014-11-19 05:15:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-11-19 05:15:43 UTC

Size: 2.72 KB

patch

obsolete

>Index: Mk/bsd.linux-apps.mk
>===================================================================
>--- Mk/bsd.linux-apps.mk	(revision 372612)
>+++ Mk/bsd.linux-apps.mk	(working copy)
>@@ -60,7 +60,7 @@ WEB_AUTH=			nvu
> # Non-version specific components
> _LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
> 					arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
>-					flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \
>+					flac fontconfig freealut gdkpixbuf gdkpixbuf2 gnutls gtk2 hicontheme imlib jpeg libaudiofile \
> 					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
> 					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
> 					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
>@@ -202,10 +202,18 @@ freealut_PORT=		${PORTSDIR}/audio/linux${LINUX_DIS
> freealut_DEPENDS=	openal
> 
> gdkpixbuf_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
>-gdkpixbuf_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
> gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> gdkpixbuf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
> 
>+gdkpixbuf2_f10_FILE=${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
>+gdkpixbuf2_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
>+gdkpixbuf2_DETECT=	${gdkpixbuf2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
>+.if ${USE_LINUX} == "c6"
>+gdkpixbuf2_PORT=	${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf2
>+.else
>+gdkpixbuf2_PORT=	${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
>+.endif
>+
> gnutls_f10_FILE=	${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
> gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
> gnutls_DETECT=		${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
>@@ -225,7 +225,7 @@ gtk2_f10_FILE=		${LINUXBASE}/usr/lib/lib
> gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
> gtk2_DETECT=		${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> gtk2_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
>-gtk2_DEPENDS=		atk gdkpixbuf jpeg png pango tiff xorglibs
>+gtk2_DEPENDS=		atk gdkpixbuf2 jpeg png pango tiff xorglibs
> 
> hicontheme_f10_FILE=	${LINUXBASE}/usr/share/icons/hicolor
> hicontheme_c6_FILE=	${LINUXBASE}/usr/share/icons/hicolor
>Index: x11-toolkits/linux-c6-gtk2/Makefile
>===================================================================
>--- x11-toolkits/linux-c6-gtk2/Makefile	(revision 372612)
>+++ x11-toolkits/linux-c6-gtk2/Makefile	(working copy)
>@@ -16,7 +16,7 @@ CONFLICTS=	linux-gtk2-[0-9]* linux-f8-gt
> 
> ONLY_FOR_ARCHS=	i386 amd64
> USE_LINUX=	c6
>-USE_LINUX_APPS=	atk gdkpixbuf jpeg pango png tiff xorglibs
>+USE_LINUX_APPS=	atk gdkpixbuf2 jpeg pango png tiff xorglibs
> USE_LINUX_RPM=	yes
> RPMVERSION=	6.el6
> BRANDELF_DIRS=	usr/bin

Actions: View | Diff

Attachments on bug 195121: 149534 | 149539 | 149540 | 149541 | 149542 | 149543 | 149544 | 149577 | 149578