Remove upstream patch that breaks DPI for most users.

(Portage version: 2.1.2.7)

4 files changed, 5 insertions, 460 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 65f6f8aa3e54..7aa7fb19e67d 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.109 2007/05/24 20:54:23 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.110 2007/05/25 12:32:38 drac Exp $
+
+  25 May 2007; Samuli Suominen <drac@gentoo.org>
+  -files/xfce-utils-4.4.1-dpi.patch, -xfce-utils-4.4.1-r2.ebuild:
+  Remove upstream patch that breaks DPI. Force downgrade to working version.
 
   24 May 2007; Lars Weiler <pylon@gentoo.org> xfce-utils-4.4.1-r1.ebuild:
   Stable on ppc; bug #178510.
diff --git a/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.1-r2 b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.1-r2
deleted file mode 100644
index da459313454e..000000000000
--- a/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7d95088e327bd8a64164696d39a1966 xfce-utils-4.4.1.tar.bz2 608154
-RMD160 65ed96acb6491829d0f97e8b1e4b5cba64a73e63 xfce-utils-4.4.1.tar.bz2 608154
-SHA256 80355762effab1e47110ac411d705b3044326e3b2cc357afefdb51e2c6f76cae xfce-utils-4.4.1.tar.bz2 608154
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.4.1-dpi.patch b/xfce-base/xfce-utils/files/xfce-utils-4.4.1-dpi.patch
deleted file mode 100644
index 06b732e734a6..000000000000
--- a/xfce-base/xfce-utils/files/xfce-utils-4.4.1-dpi.patch
+++ /dev/null
@@ -1,411 +0,0 @@
-diff -urN xfce-utils-4.4.1.orig/scripts/Makefile.am xfce-utils-4.4.1/scripts/Makefile.am
---- xfce-utils-4.4.1.orig/scripts/Makefile.am	2007-01-25 22:50:52.000000000 +0200
-+++ xfce-utils-4.4.1/scripts/Makefile.am	2007-05-23 17:43:56.000000000 +0300
-@@ -32,17 +32,24 @@
- 	$(edit) $(srcdir)/xfhelp4.in >xfhelp4.tmp
- 	mv xfhelp4.tmp xfhelp4
- 
-+xinitrc: Makefile $(srcdir)/xinitrc.in
-+	rm -f xinitrc xinitrc.tmp
-+	$(edit) $(srcdir)/xinitrc.in >xinitrc.tmp
-+	mv xinitrc.tmp xinitrc
-+
- conffilesdir=@sysconfdir@/xdg/xfce4
- conffiles_DATA=\
--	xinitrc
-+	xinitrc \
-+	Xft.xrdb
- 
- EXTRA_DIST = \
- 	$(scripts) \
- 	$(conffiles_DATA) \
- 	xfbrowser4.in \
- 	startxfce4.in \
--	xfhelp4.in
-+	xfhelp4.in \
-+	xinitrc.in
- 
- distclean-local:
--	rm -f xfhelp4 startxfce4 xfbrowser4
-+	rm -f xfhelp4 startxfce4 xfbrowser4 xinitrc
- 
-diff -urN xfce-utils-4.4.1.orig/scripts/Xft.xrdb xfce-utils-4.4.1/scripts/Xft.xrdb
---- xfce-utils-4.4.1.orig/scripts/Xft.xrdb	1970-01-01 02:00:00.000000000 +0200
-+++ xfce-utils-4.4.1/scripts/Xft.xrdb	2007-05-23 17:43:15.000000000 +0300
-@@ -0,0 +1,9 @@
-+# Those are fallback settings, use the ui plugin to change it
-+# or add your overrides to ~/.Xresources
-+# Xft DPI: 96
-+# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
-+# Xft hinting: 1/0
-+
-+Xft.dpi: 96
-+Xft.hinting: 1
-+Xft.hintstyle: hintmedium
-diff -urN xfce-utils-4.4.1.orig/scripts/xinitrc xfce-utils-4.4.1/scripts/xinitrc
---- xfce-utils-4.4.1.orig/scripts/xinitrc	2007-02-01 22:30:11.000000000 +0200
-+++ xfce-utils-4.4.1/scripts/xinitrc	1970-01-01 02:00:00.000000000 +0200
-@@ -1,176 +0,0 @@
--#!/bin/sh
--
--# fix broken $UID on some system...
--if test "x$UID" = "x"; then
--	if test -x /usr/xpg4/bin/id; then
--		UID=`/usr/xpg4/bin/id -u`;
--	else
--		UID=`id -u`;
--	fi
--fi
--
--# $XDG_CONFIG_HOME defines the base directory relative to which user specific 
--# configuration files should be stored. If $XDG_CONFIG_HOME is either not set 
--# or empty, a default equal to $HOME/.config should be used.
--if test "x$XDG_CONFIG_HOME" = "x" ; then
--  XDG_CONFIG_HOME=$HOME/.config
--fi
--[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME"
--
--# $XDG_CACHE_HOME defines the base directory relative to which user specific 
--# non-essential data files should be stored. If $XDG_CACHE_HOME is either not 
--# set or empty, a default equal to $HOME/.cache should be used.
--if test "x$XDG_CACHE_HOME" = "x" ; then
--  XDG_CACHE_HOME=$HOME/.cache
--fi
--[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
--
--# For now, start with an empty list
--XRESOURCES=""
--
--# Has to go prior to merging Xft.xrdb, as its the "Defaults" file
--test -r $HOME/.Xdefaults && XRESOURCES=$HOME/.Xdefaults
--
--BASEDIR=$XDG_CONFIG_HOME/xfce4
--if test -r "$BASEDIR/Xft.xrdb"; then
--  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
--elif test -r "$XFCE4HOME/Xft.xrdb"; then
--  mkdir -p "$BASEDIR"
--  cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/
--  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
--fi
--
--# merge in X cursor settings
--test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb"
--
--# ~/.Xresources contains overrides to the above
--test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
--
--# load all X resources (adds /dev/null to avoid an empty list that would hang the process)
--cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
--
--# load local modmap
--test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
--
--# Launch xscreensaver (if available), but only as non-root user
--test $UID -gt 0 -a -z "$VNCSESSION" && xscreensaver -no-splash &
--
--# Use ssh-agent if installed and not already running.  Run it separately
--# so it populates the environment here, so we can clean it up later.
--sshagent=`which ssh-agent`
--kill_sshagent=0
--if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then
--	eval `$sshagent -s`
--	kill_sshagent=1
--fi
--
--# Use dbus-launch if installed.
--if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
--	dbuslaunch=`which dbus-launch`
--	if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then
--		eval `$dbuslaunch --sh-syntax --exit-with-session`
--	fi
--fi
--
--# Run xfce4-session if installed
--xfcesm=`which xfce4-session`
--case "x$xfcesm" in
--	x|xno*)
--		;;
--	*)
--		$xfcesm
--
--		if test $kill_sshagent -eq 1; then
--			eval `$sshagent -k`
--		fi
--		exit 0
--		;;
--esac
--
--
--##################
--# IMPORTANT NOTE #
--##################
--
--# Everything below here ONLY gets executed if you are NOT using xfce4-session
--# (Xfce's session manager).  If you are using the session manager, everything
--# below is handled by it, and the code below is not executed at all.  If you're
--# not sure if you're using the session manager, type 'ps -e|grep xfce4-session'
--# in a terminal while Xfce is running.
--
--##################
--
--
--# this is only necessary when running w/o xfce4-session
--xsetroot -solid black -cursor_name watch
--
--# or use old-fashioned startup script otherwise
--
--xfce-mcs-manager
--xfwm4 --daemon
--
--# start up stuff in $XDG_CONFIG_HOME/autostart/, as that looks to be
--# the new standard.  if that directory doesn't exist, try the old
--# ~/Desktop/Autostart method.  we're not going to do any migration here.
--if test -d "$XDG_CONFIG_HOME/autostart"; then
--  for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do
--    grep -q -E "^Hidden=true" "$i" && continue
--    if grep -q -E "^OnlyShowIn=" "$i"; then
--      # need to test twice, as lack of the line entirely means we still run it
--      grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue
--    fi
--    grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue
--    
--    # check for TryExec
--    trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2`
--    if test "$trycmd"; then
--      type "$trycmd" >/dev/null 2>&1 || continue
--    fi
--    
--    cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2`
--    if test "$cmd" && type "$cmd" >/dev/null 2>&1; then
--      $cmd &
--    fi
--  done
--elif test -d "$HOME/Desktop/Autostart"; then
--  for i in `ls -1 -L ${HOME}/Desktop/Autostart/ 2>/dev/null`; do
--    if test -x $HOME/Desktop/Autostart/$i; then
--      $HOME/Desktop/Autostart/$i &
--    fi
--  done
--fi
--
--xfdesktop&
--orage &
--
--panel=`which xfce4-panel`
--case "x$panel" in
--	x|xno*)
--		;;
--	*)
--		$panel
--		ret=$?
--		while test $ret -ne 0; do
--			xmessage -center -file - -timeout 20 -title Error <<EOF
--A crash occured in the panel
--Please report this to the xfce4-dev@xfce.org list
--or on http://bugs.xfce.org
--Meanwhile the panel will be restarted
--EOF
--			cat >&2 <<EOF
--A crash occured in the panel
--Please report this to the xfce4-dev@xfce.org list
--or on http://bugs.xfce.org
--Meanwhile the panel will be restarted
--EOF
--			$panel
--			ret=$?
--		done
--		;;
--esac
--
--if test $kill_sshagent -eq 1; then
--	eval `$sshagent -k`
--fi
--
--xsetroot -bg white -fg red  -solid black -cursor_name watch
-diff -urN xfce-utils-4.4.1.orig/scripts/xinitrc.in xfce-utils-4.4.1/scripts/xinitrc.in
---- xfce-utils-4.4.1.orig/scripts/xinitrc.in	1970-01-01 02:00:00.000000000 +0200
-+++ xfce-utils-4.4.1/scripts/xinitrc.in	2007-05-23 17:43:33.000000000 +0300
-@@ -0,0 +1,183 @@
-+#!/bin/sh
-+
-+# fix broken $UID on some system...
-+if test "x$UID" = "x"; then
-+	if test -x /usr/xpg4/bin/id; then
-+		UID=`/usr/xpg4/bin/id -u`;
-+	else
-+		UID=`id -u`;
-+	fi
-+fi
-+
-+# $XDG_CONFIG_HOME defines the base directory relative to which user specific 
-+# configuration files should be stored. If $XDG_CONFIG_HOME is either not set 
-+# or empty, a default equal to $HOME/.config should be used.
-+if test "x$XDG_CONFIG_HOME" = "x" ; then
-+  XDG_CONFIG_HOME=$HOME/.config
-+fi
-+[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME"
-+
-+# $XDG_CACHE_HOME defines the base directory relative to which user specific 
-+# non-essential data files should be stored. If $XDG_CACHE_HOME is either not 
-+# set or empty, a default equal to $HOME/.cache should be used.
-+if test "x$XDG_CACHE_HOME" = "x" ; then
-+  XDG_CACHE_HOME=$HOME/.cache
-+fi
-+[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
-+
-+# For now, start with an empty list
-+XRESOURCES=""
-+
-+# Has to go prior to merging Xft.xrdb, as its the "Defaults" file
-+test -r "@sysconfdir@/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES @sysconfdir@/xdg/xfce4/Xft.xrdb"
-+test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults"
-+
-+BASEDIR=$XDG_CONFIG_HOME/xfce4
-+if test -r "$BASEDIR/Xft.xrdb"; then
-+  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
-+elif test -r "$XFCE4HOME/Xft.xrdb"; then
-+  mkdir -p "$BASEDIR"
-+  cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/
-+  XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb"
-+fi
-+
-+# merge in X cursor settings
-+test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb"
-+
-+# ~/.Xresources contains overrides to the above
-+test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
-+
-+# load all X resources (adds /dev/null to avoid an empty list that would hang the process)
-+cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
-+
-+# load local modmap
-+test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
-+
-+# Launch xscreensaver (if available), but only as non-root user
-+if test $UID -gt 0 -a -z "$VNCSESSION"; then 
-+    if test x"`which xscreensaver 2>/dev/null`" != x""; then
-+        xscreensaver -no-splash &
-+    elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
-+        gnome-screensaver &
-+    fi
-+fi 
-+
-+# Use ssh-agent if installed and not already running.  Run it separately
-+# so it populates the environment here, so we can clean it up later.
-+sshagent=`which ssh-agent`
-+kill_sshagent=0
-+if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then
-+	eval `$sshagent -s`
-+	kill_sshagent=1
-+fi
-+
-+# Use dbus-launch if installed.
-+if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
-+	dbuslaunch=`which dbus-launch`
-+	if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then
-+		eval `$dbuslaunch --sh-syntax --exit-with-session`
-+	fi
-+fi
-+
-+# Run xfce4-session if installed
-+xfcesm=`which xfce4-session`
-+case "x$xfcesm" in
-+	x|xno*)
-+		;;
-+	*)
-+		$xfcesm
-+
-+		if test $kill_sshagent -eq 1; then
-+			eval `$sshagent -k`
-+		fi
-+		exit 0
-+		;;
-+esac
-+
-+
-+##################
-+# IMPORTANT NOTE #
-+##################
-+
-+# Everything below here ONLY gets executed if you are NOT using xfce4-session
-+# (Xfce's session manager).  If you are using the session manager, everything
-+# below is handled by it, and the code below is not executed at all.  If you're
-+# not sure if you're using the session manager, type 'ps -e|grep xfce4-session'
-+# in a terminal while Xfce is running.
-+
-+##################
-+
-+
-+# this is only necessary when running w/o xfce4-session
-+xsetroot -solid black -cursor_name watch
-+
-+# or use old-fashioned startup script otherwise
-+
-+xfce-mcs-manager
-+xfwm4 --daemon
-+
-+# start up stuff in $XDG_CONFIG_HOME/autostart/, as that looks to be
-+# the new standard.  if that directory doesn't exist, try the old
-+# ~/Desktop/Autostart method.  we're not going to do any migration here.
-+if test -d "$XDG_CONFIG_HOME/autostart"; then
-+  for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do
-+    grep -q -E "^Hidden=true" "$i" && continue
-+    if grep -q -E "^OnlyShowIn=" "$i"; then
-+      # need to test twice, as lack of the line entirely means we still run it
-+      grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue
-+    fi
-+    grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue
-+    
-+    # check for TryExec
-+    trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2`
-+    if test "$trycmd"; then
-+      type "$trycmd" >/dev/null 2>&1 || continue
-+    fi
-+    
-+    cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2`
-+    if test "$cmd" && type "$cmd" >/dev/null 2>&1; then
-+      $cmd &
-+    fi
-+  done
-+elif test -d "$HOME/Desktop/Autostart"; then
-+  for i in `ls -1 -L ${HOME}/Desktop/Autostart/ 2>/dev/null`; do
-+    if test -x $HOME/Desktop/Autostart/$i; then
-+      $HOME/Desktop/Autostart/$i &
-+    fi
-+  done
-+fi
-+
-+xfdesktop&
-+orage &
-+
-+panel=`which xfce4-panel`
-+case "x$panel" in
-+	x|xno*)
-+		;;
-+	*)
-+		$panel
-+		ret=$?
-+		while test $ret -ne 0; do
-+			xmessage -center -file - -timeout 20 -title Error <<EOF
-+A crash occured in the panel
-+Please report this to the xfce4-dev@xfce.org list
-+or on http://bugs.xfce.org
-+Meanwhile the panel will be restarted
-+EOF
-+			cat >&2 <<EOF
-+A crash occured in the panel
-+Please report this to the xfce4-dev@xfce.org list
-+or on http://bugs.xfce.org
-+Meanwhile the panel will be restarted
-+EOF
-+			$panel
-+			ret=$?
-+		done
-+		;;
-+esac
-+
-+if test $kill_sshagent -eq 1; then
-+	eval `$sshagent -k`
-+fi
-+
-+xsetroot -bg white -fg red  -solid black -cursor_name watch
diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.1-r2.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.1-r2.ebuild
deleted file mode 100644
index 199c1ad674d9..000000000000
--- a/xfce-base/xfce-utils/xfce-utils-4.4.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.1-r2.ebuild,v 1.1 2007/05/23 15:03:53 drac Exp $
-
-inherit autotools eutils xfce44
-
-XFCE_VERSION=4.4.1
-xfce44
-
-DESCRIPTION="Collection of utils"
-HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus debug"
-
-RDEPEND="x11-apps/xrdb
-	x11-libs/libX11
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
-	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
-	dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=xfce-extra/xfce4-dev-tools-4.4"
-
-XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-xfce44_core_package
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-xdg_data_dirs.patch
-	epatch "${FILESDIR}"/${P}-dpi.patch
-	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
-}
-
-src_install() {
-	xfce44_src_install
-	insinto /usr/share/xfce4
-	newins ${FILESDIR}/Gentoo Gentoo
-}