Page MenuHomeFreeBSD

D1192.id2474.diff
No OneTemporary

D1192.id2474.diff

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -7237,3 +7237,4 @@
deskutils/gtkjournal||2014-11-19|Abandonware, not working anymore
deskutils/splashsetter||2014-11-19|Abandonware, useless without gnome2
editors/emacs23|editors/emacs|2014-11-19|Has expired: Unmaintained upstream, use editors/emacs
+​graphics/linux-c6-gdk-pixbuf|graphics/linux-c6-gdk-pixbuf2|2014-11-20|Port renamed to align with upstream.
Index: Mk/bsd.linux-apps.mk
===================================================================
--- Mk/bsd.linux-apps.mk
+++ Mk/bsd.linux-apps.mk
@@ -60,7 +60,7 @@
# 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_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} == "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_c6_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
gnutls_DETECT= ${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
@@ -216,7 +224,7 @@
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 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: graphics/linux-c6-gdk-pixbuf/Makefile
===================================================================
--- graphics/linux-c6-gdk-pixbuf/Makefile
+++ graphics/linux-c6-gdk-pixbuf/Makefile
@@ -1,20 +0,0 @@
-# Created by: Kris Moore <kmoore@freebsd.org>
-# $FreeBSD$
-
-PORTNAME= gdk-pixbuf2
-PORTVERSION= 2.24.1
-CATEGORIES= graphics linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= RPM of the gdk-pixbuf lib (Linux CentOS ${LINUX_DIST_VER})
-
-ONLY_FOR_ARCHS= i386 amd64
-USE_LINUX= c6
-USE_LINUX_RPM= yes
-RPMVERSION= 5.el6
-LINUX_NAME= lib${PORTNAME}
-BRANDELF_DIRS= usr/bin
-USE_LDCONFIG= yes
-DESCR= ${.CURDIR}/../gdk-pixbuf2/pkg-descr
-
-.include <bsd.port.mk>
Index: graphics/linux-c6-gdk-pixbuf/distinfo.i686
===================================================================
--- graphics/linux-c6-gdk-pixbuf/distinfo.i686
+++ graphics/linux-c6-gdk-pixbuf/distinfo.i686
@@ -1,4 +0,0 @@
-SHA256 (rpm/i686/centos/6.6/gdk-pixbuf2-2.24.1-5.el6.i686.rpm) = 20342abbde6fa02935bc0e66f1d06167a43515c06836e9afea3d47c9f47e0bd1
-SIZE (rpm/i686/centos/6.6/gdk-pixbuf2-2.24.1-5.el6.i686.rpm) = 510168
-SHA256 (rpm/i686/centos/6.6/gdk-pixbuf2-2.24.1-5.el6.src.rpm) = 938434b89be45e2cf1eab558ed31b6deadb0ddc410544279cf782ba98431239b
-SIZE (rpm/i686/centos/6.6/gdk-pixbuf2-2.24.1-5.el6.src.rpm) = 1186070
Index: graphics/linux-c6-gdk-pixbuf/pkg-plist
===================================================================
--- graphics/linux-c6-gdk-pixbuf/pkg-plist
+++ graphics/linux-c6-gdk-pixbuf/pkg-plist
@@ -1,127 +0,0 @@
-usr/bin/gdk-pixbuf-query-loaders-32
-usr/bin/update-gdk-pixbuf-loaders
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
-usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
-usr/lib/libgdk_pixbuf-2.0.so.0
-usr/lib/libgdk_pixbuf-2.0.so.0.2400.1
-usr/lib/libgdk_pixbuf_xlib-2.0.so.0
-usr/lib/libgdk_pixbuf_xlib-2.0.so.0.2400.1
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.1/NEWS
-usr/share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/as/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ast/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/az/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/be/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/be@latin/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/bg/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/bn/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/bn_IN/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/br/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/bs/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ca@valencia/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/crh/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/cy/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/da/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/de/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/dz/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/el/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/en@shaw/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/en_CA/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/en_GB/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/es/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/et/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ga/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/gl/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/gu/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/he/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/hi/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/id/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/io/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/is/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/it/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ku/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/li/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/lv/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/mai/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/mi/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/mk/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ml/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/mn/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/mr/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ms/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/my/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/nds/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ne/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/nl/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/nn/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/nso/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/oc/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/or/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/pa/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ps/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/pt/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ro/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ru/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/si/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sl/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sq/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sr/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sr@ije/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sr@latin/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/te/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/vi/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/wa/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/xh/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/yi/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
-usr/share/man/man1/gdk-pixbuf-query-loaders.1.gz
Index: www/linux-c6-flashplugin11/Makefile
===================================================================
--- www/linux-c6-flashplugin11/Makefile
+++ www/linux-c6-flashplugin11/Makefile
@@ -17,7 +17,7 @@
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 gtk2 nspr nss openssl-compat #-alsalib libssh2 openldap
WANT_GNOME= yes
RESTRICTED= Redistribution not allowed
Index: www/linux-opera/Makefile
===================================================================
--- www/linux-opera/Makefile
+++ www/linux-opera/Makefile
@@ -22,7 +22,7 @@
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= gtk2 naslibs png sqlite3 xorglibs
ONLY_FOR_ARCHS= i386 amd64
USES= desktop-file-utils shared-mime-info tar:xz
WANT_GNOME= yes
Index: x11-toolkits/linux-c6-gtk2/Makefile
===================================================================
--- x11-toolkits/linux-c6-gtk2/Makefile
+++ x11-toolkits/linux-c6-gtk2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gtk2
PORTVERSION= 2.24.23
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm \
@@ -16,7 +17,7 @@
ONLY_FOR_ARCHS= i386 amd64
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
RPMVERSION= 6.el6
BRANDELF_DIRS= usr/bin

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 2:32 AM (6 m, 10 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32319410
Default Alt Text
D1192.id2474.diff (11 KB)

Event Timeline