mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
graphics/linux-c6-gdk-pixbuf: rename to -pixbuf2
- Rename gdk-pixbuf to linux-c6-gdk-pixbuf2 to properly distinguish between linux- gdk-pixbuf 1 and 2. - Change consumers dependencies to match. PR: 195120, 195121 Differential Revision: https://reviews.freebsd.org/D1192 Submitted by: Jan Beich <jbeich@vfemail.net> Reviewed by: rene (emulation) Approved by: swills (mentor) Approved by: portmgr (swills)
This commit is contained in:
parent
ae9961ddce
commit
455193b742
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=373192
1
MOVED
1
MOVED
@ -7232,3 +7232,4 @@ editors/emacs23|editors/emacs|2014-11-19|Has expired: Unmaintained upstream, use
|
|||||||
net-im/tg|net-im/telegram|2014-11-20|Renamed to more specific name
|
net-im/tg|net-im/telegram|2014-11-20|Renamed to more specific name
|
||||||
net-mgmt/virtinst|deskutils/virt-manager|2014-11-20|Obsoleted by deskutils/virt-manager
|
net-mgmt/virtinst|deskutils/virt-manager|2014-11-20|Obsoleted by deskutils/virt-manager
|
||||||
sysutils/firstboot-growfs||2014-11-23|Part of the base system
|
sysutils/firstboot-growfs||2014-11-23|Part of the base system
|
||||||
|
graphics/linux-c6-gdk-pixbuf|graphics/linux-c6-gdk-pixbuf2|2014-11-24|Port renamed to align with upstream.
|
||||||
|
@ -60,7 +60,7 @@ WEB_AUTH= nvu
|
|||||||
# Non-version specific components
|
# Non-version specific components
|
||||||
_LINUX_APPS_ALL= allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
|
_LINUX_APPS_ALL= allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
|
||||||
arts aspell atk avahi-libs cairo cups-libs curl dri devtools esound expat \
|
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 \
|
libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
|
||||||
libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
|
libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
|
||||||
naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
|
naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
|
||||||
@ -202,10 +202,18 @@ freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut
|
|||||||
freealut_DEPENDS= openal
|
freealut_DEPENDS= openal
|
||||||
|
|
||||||
gdkpixbuf_f10_FILE= ${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
|
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_DETECT= ${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
|
||||||
gdkpixbuf_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
|
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} == "f10" || ${USE_LINUX} == "yes" # temporary default, remove or clause soon
|
||||||
|
gdkpixbuf2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
|
||||||
|
.else
|
||||||
|
gdkpixbuf2_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf2
|
||||||
|
.endif
|
||||||
|
|
||||||
gnutls_f10_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
|
gnutls_f10_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
|
||||||
gnutls_c6_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
|
gnutls_c6_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
|
||||||
gnutls_DETECT= ${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
|
gnutls_DETECT= ${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
|
||||||
@ -216,7 +224,7 @@ gtk2_f10_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1400.7
|
|||||||
gtk2_c6_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
|
gtk2_c6_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
|
||||||
gtk2_DETECT= ${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
|
gtk2_DETECT= ${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
|
||||||
gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
|
gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
|
||||||
gtk2_DEPENDS= atk jpeg png pango tiff xorglibs
|
gtk2_DEPENDS= atk gdkpixbuf2 jpeg png pango tiff xorglibs
|
||||||
|
|
||||||
hicontheme_f10_FILE= ${LINUXBASE}/usr/share/icons/hicolor
|
hicontheme_f10_FILE= ${LINUXBASE}/usr/share/icons/hicolor
|
||||||
hicontheme_c6_FILE= ${LINUXBASE}/usr/share/icons/hicolor
|
hicontheme_c6_FILE= ${LINUXBASE}/usr/share/icons/hicolor
|
||||||
|
@ -17,7 +17,7 @@ COMMENT= Adobe Flash Player NPAPI Plugin
|
|||||||
|
|
||||||
ONLY_FOR_ARCHS= amd64 i386
|
ONLY_FOR_ARCHS= amd64 i386
|
||||||
USE_LINUX= c6
|
USE_LINUX= c6
|
||||||
USE_LINUX_APPS= curl cyrus-sasl2 gdkpixbuf gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap
|
USE_LINUX_APPS= curl cyrus-sasl2 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap
|
||||||
WANT_GNOME= yes
|
WANT_GNOME= yes
|
||||||
|
|
||||||
RESTRICTED= Redistribution not allowed
|
RESTRICTED= Redistribution not allowed
|
||||||
|
@ -22,7 +22,7 @@ COMMENT= Blazingly fast, full-featured, standards-compliant browser
|
|||||||
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
|
RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
|
||||||
|
|
||||||
USE_LINUX= yes
|
USE_LINUX= yes
|
||||||
USE_LINUX_APPS= gdkpixbuf gtk2 naslibs png sqlite3 xorglibs
|
USE_LINUX_APPS= gtk2 naslibs png sqlite3 xorglibs
|
||||||
ONLY_FOR_ARCHS= i386 amd64
|
ONLY_FOR_ARCHS= i386 amd64
|
||||||
USES= desktop-file-utils shared-mime-info tar:xz
|
USES= desktop-file-utils shared-mime-info tar:xz
|
||||||
WANT_GNOME= yes
|
WANT_GNOME= yes
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
PORTNAME= gtk2
|
PORTNAME= gtk2
|
||||||
PORTVERSION= 2.24.23
|
PORTVERSION= 2.24.23
|
||||||
|
PORTREVISION= 1
|
||||||
CATEGORIES= x11-toolkits linux
|
CATEGORIES= x11-toolkits linux
|
||||||
DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
|
DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
|
||||||
${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm \
|
${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm \
|
||||||
@ -16,7 +17,7 @@ CONFLICTS= linux-gtk2-[0-9]* linux-f8-gtk2-[0-9]* linux-f10-gtk2-[0-9]*
|
|||||||
|
|
||||||
ONLY_FOR_ARCHS= i386 amd64
|
ONLY_FOR_ARCHS= i386 amd64
|
||||||
USE_LINUX= c6
|
USE_LINUX= c6
|
||||||
USE_LINUX_APPS= png jpeg tiff xorglibs pango atk
|
USE_LINUX_APPS= atk gdkpixbuf2 jpeg pango png tiff xorglibs
|
||||||
USE_LINUX_RPM= yes
|
USE_LINUX_RPM= yes
|
||||||
RPMVERSION= 6.el6
|
RPMVERSION= 6.el6
|
||||||
BRANDELF_DIRS= usr/bin
|
BRANDELF_DIRS= usr/bin
|
||||||
|
Loading…
Reference in New Issue
Block a user