svn commit: r368845 - in head: . Mk accessibility accessibility/linux-c6-atk accessibility/linux-f10-atk archivers/linux-f10-ucl archivers/linux-f10-upx astro/google-earth astro/google-earth/files ...

[Jan Beich]

Johannes Jost Meixner <xmj at FreeBSD.org> writes:

> Log:
>   Update CentOS base to 6.5, add userland ports
[...]
> Index: audio/linux-f10-alsa-plugins-oss/Makefile
> ===================================================================
> --- audio/linux-f10-alsa-plugins-oss/Makefile	(revision 368844)
> +++ audio/linux-f10-alsa-plugins-oss/Makefile	(revision 368845)
> @@ -5,16 +5,15 @@ PORTNAME=	alsa-plugins-oss
>  PORTVERSION=	1.0.21
>  PORTREVISION=	3
>  CATEGORIES=	audio linux
> -PKGNAMEPREFIX=	linux-f10-
> -DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
> 
> -MAINTAINER=	emulation at FreeBSD.org
> +MAINTAINER=	hashiz at meridiani.jp

Trying to regress r360923 ?

> Index: www/linux-seamonkey/Makefile.common
> ===================================================================
> --- www/linux-seamonkey/Makefile.common	(revision 368844)
> +++ www/linux-seamonkey/Makefile.common	(revision 368845)
> @@ -1,9 +1,9 @@
>  # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
>  # $FreeBSD$
> -
> +.undef WANT_GTK218
>  .if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
> -    ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
> -.undef WANT_GTK218
> +    ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
> +.def WANT_GTK218

.def is invalid make(1) keyword. And not every f10 port needs f12 libs
e.g., net-im/linux-instantbird works fine without.

>  .endif

The change was neither reviewed[1] by anyone from gecko@ nor makes any
sense before USE_LINUX=c6 becomes the default. Please, back out
to fix the following regression.

$ linux-firefox
/usr/local/lib/linux-firefox/firefox: symbol lookup error: /usr/local/lib/linux-firefox/libxul.so: undefined symbol: gtk_widget_set_can_focus

$ linux-thunderbird
/usr/local/lib/linux-thunderbird/thunderbird: symbol lookup error: /usr/local/lib/linux-thunderbird/libxul.so: undefined symbol: gtk_widget_set_can_focus

$ linux-seamonkey
/usr/local/lib/linux-seamonkey/seamonkey: symbol lookup error: /usr/local/lib/linux-seamonkey/libxul.so: undefined symbol: gtk_widget_set_can_focusan_focus

[1] ENOTIME to constantly track changes in non-mainline repos and
    phabricator is read-only for non-committers.

> 
>  CATEGORIES+=	linux
> @@ -29,8 +29,8 @@ ONLY_FOR_ARCHS=	i386 amd64
>  APP_NAME=	${PKGBASE}
>  BIN_NAME?=	${PORTNAME}
>  USE_LINUX=	yes
> -USE_LINUX_APPS+=alsalib alsa-plugins-oss atk dbusglib dbuslibs \
> -		fontconfig gtk2 hicontheme pango
> +USE_LINUX_APPS+=	alsalib alsa-plugins-oss atk dbusglib dbuslibs \
> +			fontconfig gtk2 hicontheme pango

This change is unrelated and doesn't improve consistency in the file.

-------------------------------------------------

VFEmail.net - http://www.vfemail.net
ONLY AT VFEmail! - Use our Metadata Mitigator to keep your email out of the NSA's hands!
$24.95 ONETIME Lifetime accounts with Privacy Features!  
15GB disk! No bandwidth quotas!
Commercial and Bulk Mail Options!