FreeBSD Bugzilla – Attachment 149539 Details for
Bug 195121
graphics/linux-c6-gdk-pixbuf: rename to -pixbuf2 to avoid conflating with 0.22.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
rename, v2
gdkpixbuf2.diff (text/plain), 3.37 KB, created by
Jan Beich
on 2014-11-17 23:39:34 UTC
(
hide
)
Description:
rename, v2
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2014-11-17 23:39:34 UTC
Size:
3.37 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} >Index: www/linux-c6-flashplugin11/Makefile >=================================================================== >--- www/linux-c6-flashplugin11/Makefile (revision 372685) >+++ www/linux-c6-flashplugin11/Makefile (working copy) >@@ -17,7 +17,7 @@ COMMENT= Adobe Flash Player NPAPI Plugin > > ONLY_FOR_ARCHS= amd64 i386 > USE_LINUX= c6 >-USE_LINUX_APPS= curl cyrus-sasl2 gdkpixbuf gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap >+USE_LINUX_APPS= curl cyrus-sasl2 gdkpixbuf2 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap > WANT_GNOME= yes > > RESTRICTED= Redistribution not allowed >Index: www/linux-opera/Makefile >=================================================================== >--- www/linux-opera/Makefile (revision 372612) >+++ www/linux-opera/Makefile (working copy) >@@ -22,7 +22,7 @@ COMMENT= Blazingly fast, full-featured, standards- > RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info > > USE_LINUX= yes >-USE_LINUX_APPS= gdkpixbuf gtk2 naslibs png sqlite3 xorglibs >+USE_LINUX_APPS= gdkpixbuf2 gtk2 naslibs png sqlite3 xorglibs > ONLY_FOR_ARCHS= i386 amd64 > USES= desktop-file-utils shared-mime-info tar:xz > WANT_GNOME= yes >diff --git www/linux-seamonkey/Makefile.common www/linux-seamonkey/Makefile.common >index 47ddb05..afac608 100644 >--- www/linux-seamonkey/Makefile.common >+++ www/linux-seamonkey/Makefile.common >@@ -29,7 +29,7 @@ APP_NAME= ${PKGBASE} > BIN_NAME?= ${PORTNAME} > USE_LINUX= yes > USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \ >- fontconfig gdkpixbuf gtk2 hicontheme pango >+ fontconfig gdkpixbuf2 gtk2 hicontheme pango > > WRKSRC?= ${WRKDIR}/${BIN_NAME} > FDIR= ${STAGEDIR}${PREFIX}/lib/${APP_NAME}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195121
:
149534
|
149539
|
149540
|
149541
|
149542
|
149543
|
149544
|
149577
|
149578