Hello community,
here is the log from the commit of package compiz
checked in at Fri Feb 2 16:00:05 CET 2007.
--------
--- compiz/compiz.changes 2007-01-22 22:57:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-02-02 14:47:18.000000000 +0100
@@ -1,0 +2,22 @@
+Fri Feb 2 12:54:50 CET 2007 - mhopf@suse.de
+
+- Don't build and link statically against local Mesa any longer,
+ if libIndirectGL is available. (#234154)
+
+-------------------------------------------------------------------
+Fri Feb 2 11:58:59 CET 2007 - mhopf@suse.de
+
+- Update gnome-xgl-settings tarball:
+ - incorporate earlier patches
+ - fix detection in machines with multiple video cards (#177818)
+ - always provide link to wiki (#187799)
+ - don't complain about very large monitors (#238303)
+ - update icon (#240419)
+
+-------------------------------------------------------------------
+Thu Feb 1 14:56:10 CET 2007 - mhopf@suse.de
+
+- Update to compiz 0.3.7 as in SLE10-SP1
+- Include new logo for gnome-xgl-settings. #236822
+
+-------------------------------------------------------------------
Old:
----
compiz-0.3.6.tar.bz2
gnome-xgl-settings-0.8.tar.gz
New:
----
compiz-0.3.7.tar.bz2
compiz-ldpreload-indirect.diff
gnome-xgl-settings-0.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.fg9112/_old 2007-02-02 15:59:41.000000000 +0100
+++ /var/tmp/diff_new_pack.fg9112/_new 2007-02-02 15:59:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package compiz (Version 0.3.6)
+# spec file for package compiz (Version 0.3.7)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,7 +10,7 @@
Name: compiz
-BuildRequires: control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel mDNSResponder-lib metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel
+BuildRequires: Mesa-devel control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel mDNSResponder-lib metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel
%if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10"
BuildRequires: xorg-x11-compat70-devel
%endif
@@ -21,23 +21,24 @@
Requires: libpng libdrm gtk2 librsvg libwnck metacity >= 2.15.1
Enhances: xgl >= git_070104
Autoreqprov: on
-Version: 0.3.6
-Release: 4
+Version: 0.3.7
+Release: 1
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
Source: MesaLib-6.5.2.tar.bz2
Source1: compiz-%version.tar.bz2
-Source2: gnome-xgl-settings-0.8.tar.gz
+Source2: gnome-xgl-settings-0.9.tar.gz
Source3: opensuse.png
Patch: compiz-java-config-notify.diff
Patch1: compiz-default-gconf-settings.patch
Patch2: compiz-broken-Mesa-decl.patch
Patch3: compiz-decorator-default.diff
Patch4: compiz-opensuse-logo.diff
+Patch5: libqtpath.patch
+Patch6: compiz-ldpreload-indirect.diff
Patch32: gnome-xgl-switch-md5dir.diff
Patch60: Mesa-x86_64-fixes.patch
-Patch61: libqtpath.patch
%if "%(xft-config --prefix)" == "/usr"
%define xorg_prefix %_prefix
%else
@@ -124,11 +125,12 @@
%patch3
%patch4
%ifarch x86_64
-%patch61 -p0
+%patch5
%endif
+%patch6 -p1
cd -
cd gnome-xgl-*
-%patch32 -p0
+%patch32
sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch
cd -
cd Mesa-*
@@ -145,28 +147,37 @@
#
##### Mesa
#
-pushd Mesa-*
-ln -snf linux-indirect-static configs/current
-make EXTRA_LIB_PATH=-L%xorg_prefix/%_lib \
+if [ -f /usr/%_lib/libIndirectGL.so ] ; then
+ mesagl="--prefix=%_prefix"
+else
+ echo 1>&2 ""
+ echo 1>&2 "###########################################################"
+ echo 1>&2 "Building with statically linked Mesa for indirect rendering"
+ echo 1>&2 "###########################################################"
+ echo 1>&2 ""
+ pushd Mesa-*
+ ln -snf linux-indirect-static configs/current
+ make EXTRA_LIB_PATH=-L%xorg_prefix/%_lib \
LIB_DIR=%_lib \
ARCH_FLAGS="-fno-strict-aliasing %optflags"
-popd
+ popd
+ mesagl="--with-gl-libs=`echo %_builddir/Mesa-*/%_lib/libGL.a` -L%xorg_prefix/%_lib -lX11 -lXext -lXxf86vm -pthread -ldrm"
+fi
#
##### compiz
#
pushd compiz-*
-# Need special static libGL (EXT_texture_from_pixmap) for indirect rendering when using fglrx (nvidia might be fixed now)
-# TODO: this of course won't work with AIGLX
-mesagl="`echo %_builddir/Mesa-*/%_lib/libGL.a`"
%configure --prefix=%_prefix --libdir=%_prefix/%_lib \
--enable-libsvg-cairo \
--enable-librsvg \
--sysconfdir=%gnome_etc \
--with-scale-corner=TopLeft \
- --with-gl-libs="$mesagl -L%xorg_prefix/%_lib -lX11 -lXext -lXxf86vm -pthread -ldrm" \
+ "$mesagl" \
--with-default-plugins="png,decoration,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,screenshot"
make %{?jobs:-j%jobs} CFLAGS="%optflags"
-sed -i -e "s@$mesagl@@g" compiz.pc
+if [ ! -f /usr/%_lib/libIndirectGL.so ] ; then
+ sed -i -e "s@$mesagl@@g" compiz.pc
+fi
popd
#
##### gnome-xgl-settings
@@ -235,6 +246,19 @@
%_bindir/kde-window-decorator
%changelog -n compiz
+* Fri Feb 02 2007 - mhopf@suse.de
+- Don't build and link statically against local Mesa any longer,
+ if libIndirectGL is available. (#234154)
+* Fri Feb 02 2007 - mhopf@suse.de
+- Update gnome-xgl-settings tarball:
+ - incorporate earlier patches
+ - fix detection in machines with multiple video cards (#177818)
+ - always provide link to wiki (#187799)
+ - don't complain about very large monitors (#238303)
+ - update icon (#240419)
+* Thu Feb 01 2007 - mhopf@suse.de
+- Update to compiz 0.3.7 as in SLE10-SP1
+- Include new logo for gnome-xgl-settings. #236822
* Mon Jan 22 2007 - jpr@suse.de
- Make transluceny and other options work in the settings dialog
(#235542)
++++++ compiz-0.3.6.tar.bz2 -> compiz-0.3.7.tar.bz2 ++++++
++++ 14183 lines of diff (skipped)
++++++ compiz-java-config-notify.diff ++++++
--- /var/tmp/diff_new_pack.fg9112/_old 2007-02-02 15:59:43.000000000 +0100
+++ /var/tmp/diff_new_pack.fg9112/_new 2007-02-02 15:59:43.000000000 +0100
@@ -1,23 +1,23 @@
-diff -urp ../compiz-0.3.2.orig/src/window.c ./src/window.c
---- ../compiz-0.3.2.orig/src/window.c 2006-10-20 20:38:30.000000000 +0200
-+++ ./src/window.c 2006-11-14 13:00:41.000000000 +0100
-@@ -2331,6 +2331,9 @@ syncWindowPosition (CompWindow *w)
+diff -ur ../compiz-0.3.7.old/src/window.c ./src/window.c
+--- ../compiz-0.3.7.old/src/window.c 2007-01-04 16:38:09.522264000 +0100
++++ ./src/window.c 2007-01-04 16:43:22.342132000 +0100
+@@ -2491,6 +2491,9 @@
XMoveWindow (w->screen->display->display, w->frame,
- w->attrib.x - w->input.left,
- w->attrib.y - w->input.top);
+ w->serverX - w->input.left,
+ w->serverY - w->input.top);
+
+ if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0)
-+ sendConfigureNotify (w);
++ sendConfigureNotify (w);
}
- void
-@@ -2865,6 +2868,9 @@ configureXWindow (CompWindow *w,
- if (w->frame && (valueMask & (CWSibling | CWStackMode)))
- XConfigureWindow (w->screen->display->display, w->frame,
- valueMask & (CWSibling | CWStackMode), xwc);
-+
+ Bool
+@@ -3438,6 +3441,9 @@
+
+ configureXWindow (w, xwcm, xwc);
+
+ if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0)
+ sendConfigureNotify (w);
++
+ if (placed)
+ w->placed = TRUE;
}
-
- static Bool
++++++ compiz-ldpreload-indirect.diff ++++++
--- a/src/display.c
+++ b/src/display.c
@@ -46,6 +46,8 @@
#include
+extern Bool noLibGLFallback;
+
static unsigned int virtualModMask[] = {
CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask,
CompModeSwitchMask, CompNumLockMask, CompScrollLockMask
@@ -2513,6 +2515,17 @@ addDisplay (char *name,
return FALSE;
}
+ if (!noLibGLFallback)
+ {
+ int major, minor;
+
+ if (!glXQueryVersion (dpy, &major, &minor))
+ return FALSE;
+
+ if (major < 2 || minor < 4)
+ return FALSE;
+ }
+
compDisplayInitOptions (d, plugin, nPlugin);
snprintf (d->displayString, 255, "DISPLAY=%s", DisplayString (dpy));
diff --git a/src/main.c b/src/main.c
index ec50353..f87bd90 100644
--- a/src/main.c
+++ b/src/main.c
@@ -86,6 +86,8 @@ Bool noDetection = FALSE;
Bool useCow = TRUE;
#endif
+Bool noLibGLFallback = FALSE;
+
static void
usage (void)
{
@@ -226,6 +228,10 @@ main (int argc, char **argv)
if (i + 1 < argc)
backgroundImage = argv[++i];
}
+ else if (!strcmp (argv[i], "--no-libgl-fallback"))
+ {
+ noLibGLFallback = TRUE;
+ }
else if (*argv[i] == '-')
{
fprintf (stderr, "%s: Unknown option '%s'\n", programName, argv[i]);
@@ -237,11 +243,37 @@ main (int argc, char **argv)
}
}
+ if (noLibGLFallback)
+ unsetenv ("LD_PRELOAD");
+
if (!disableSm)
initSession (clientId);
if (!addDisplay (displayName, plugin, nPlugin))
+ {
+ if (!noLibGLFallback)
+ {
+ char *arg[argc + 2];
+
+ memcpy (arg, argv, sizeof (char *) * argc);
+
+ arg[argc] = "--no-libgl-fallback";
+ arg[argc + 1] = NULL;
+
+#if INT_MAX != LONG_MAX
+#define INDIRECT_LIBGL "/usr/lib64/libIndirectGL.so.1"
+#else
+#define INDIRECT_LIBGL "/usr/lib/libIndirectGL.so.1"
+#endif
+
+ fprintf (stderr, "%s: Trying '%s'\n", programName, INDIRECT_LIBGL);
+
+ setenv ("LD_PRELOAD", INDIRECT_LIBGL, TRUE);
+ execvp (arg[0], arg);
+ }
+
return 1;
+ }
eventLoop ();
++++++ gnome-xgl-settings-0.8.tar.gz -> gnome-xgl-settings-0.9.tar.gz ++++++
++++ 19776 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/ChangeLog new/gnome-xgl-settings-0.9/ChangeLog
--- old/gnome-xgl-settings-0.8/ChangeLog 2007-01-22 21:57:41.000000000 +0100
+++ new/gnome-xgl-settings-0.9/ChangeLog 2007-02-01 19:34:29.000000000 +0100
@@ -1,5 +1,49 @@
+2007-02-01 Dan Winship
+
+ * configure.in: 0.9
+
+2007-02-01 Dan Winship
+
+ * xgl-settings/xgl-settings-capplet.svg: update to new artwork
+ from jimmac. #240419
+
+ * xgl-settings/gnome-xgl-switch: fix SuSEconfig.xdm invocation.
+ (patch from autobuild)
+
+2007-02-01 Dan Winship
+
+ * xgl-settings/switch.c (update_switch_page): Don't enforce
+ certain screen resolutions; let users with small screens (less
+ than 1024x768) enable Xgl without warnings, and let users with
+ very large screens (larger than 1920x1200) enable it *with* a
+ warning. #238303
+
+2007-02-01 Dan Winship
+
+ * xgl-settings/gnome-xgl-settings.glade: add a Help button.
+
+ * xgl-settings/gnome-xgl-settings.c (response_cb): if Help is
+ clicked, visit the wiki.
+ (notebook_switch_page): Disable Help when not on the
+ enable/disable page, since it doesn't apply there.
+
+ * xgl-settings/switch.c (update_switch_page): Update to reflect
+ the fact that the Help button is always shown. (In particular,
+ say "if you have enabled Xgl and it's causing problems, click Help
+ to visit the wiki".) #187799
+
+2007-02-01 Dan Winship
+
+ * xgl-settings/gnome-xgl-info: Use "hwinfo --gfxcard" rather than
+ lspci to query the hardware: when there are multiple cards, hwinfo
+ tells which one is active. #177818.
+
2007-01-22 JP Rosevear
+ * configure.in: bump to 0.8
+
+2007-01-22 JP Rosevear
+
* xgl-settings/settings.c: update keybinding gconf keys for 0.3.x
2007-01-22 JP Rosevear
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/configure.in new/gnome-xgl-settings-0.9/configure.in
--- old/gnome-xgl-settings-0.8/configure.in 2007-01-22 20:56:13.000000000 +0100
+++ new/gnome-xgl-settings-0.9/configure.in 2007-02-01 19:19:33.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([gnome-xgl-settings], [0.8],
+AC_INIT([gnome-xgl-settings], [0.9],
[https://bugzilla.novell.com/enter_bug.cgi?product=SUSE+Linux+Enterprise+Desktop+10&component=Xgl])
AC_CONFIG_SRCDIR([xgl-settings])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/intltool-extract.in new/gnome-xgl-settings-0.9/intltool-extract.in
--- old/gnome-xgl-settings-0.8/intltool-extract.in 2007-01-22 17:00:34.000000000 +0100
+++ new/gnome-xgl-settings-0.9/intltool-extract.in 2007-02-01 19:20:26.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.2";
+my $VERSION = "0.35.0";
## Loaded modules
use strict;
@@ -114,11 +114,6 @@
sub place_normal {
$FILE = $ARGV[0];
$OUTFILE = "$FILE.h";
-
- my $dirname = dirname ($OUTFILE);
- if (! -d "$dirname" && $dirname ne "") {
- system ("mkdir -p $dirname");
- }
}
sub place_local {
@@ -161,7 +156,7 @@
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
- "gettext/scheme", "gettext/xml", "gettext/quoted"
+ "gettext/scheme", "gettext/xml"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
@@ -217,7 +212,6 @@
&type_scheme if $gettext_type eq "scheme";
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
- &type_quoted if $gettext_type eq "quoted";
}
sub entity_decode_minimal
@@ -248,7 +242,7 @@
{
return '\"' if $_ eq '"';
return '\n' if $_ eq "\n";
- return '\\\\' if $_ eq '\\';
+ return '\\' if $_ eq '\\';
return $_;
}
@@ -717,17 +711,6 @@
return @list;
}
-sub type_quoted {
- while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
- my $message = $1;
- my $before = $`;
- $message =~ s/\\\"/\"/g;
- $before =~ s/[^\n]//g;
- $messages{$message} = [];
- $loc{$message} = length ($before) + 2;
- }
-}
-
sub type_glade {
### For translatable Glade XML files ###
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/intltool-merge.in new/gnome-xgl-settings-0.9/intltool-merge.in
--- old/gnome-xgl-settings-0.8/intltool-merge.in 2007-01-22 17:00:34.000000000 +0100
+++ new/gnome-xgl-settings-0.9/intltool-merge.in 2007-02-01 19:20:26.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.2";
+my $VERSION = "0.35.0";
## Loaded modules
use strict;
@@ -60,7 +60,6 @@
my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
-my $QUOTED_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -80,7 +79,6 @@
"desktop-style|d" => \$DESKTOP_STYLE_ARG,
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "quoted-style" => \$QUOTED_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -159,14 +157,6 @@
&rfc822deb_merge_translations;
&finalize;
}
-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
-{
- &utf8_sanity_check;
- &preparation;
- &print_message;
- "ed_merge_translations;
- &finalize;
-}
else
{
&print_help;
@@ -203,7 +193,6 @@
-k, --keys-style includes translations in the keys style
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
- --quoted-style includes translations in the quoted string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -426,7 +415,7 @@
{
$nextfuzzy = 1 if /^#, fuzzy/;
- if (/^msgid "((\\.|[^\\]+)*)"/ )
+ if (/^msgid "((\\.|[^\\])*)"/ )
{
$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
$msgid = "";
@@ -442,14 +431,14 @@
$nextfuzzy = 0;
}
- if (/^msgstr "((\\.|[^\\]+)*)"/)
+ if (/^msgstr "((\\.|[^\\])*)"/)
{
$msgstr = unescape_po_string($1);
$inmsgstr = 1;
$inmsgid = 0;
}
- if (/^"((\\.|[^\\]+)*)"/)
+ if (/^"((\\.|[^\\])*)"/)
{
$msgid .= unescape_po_string($1) if $inmsgid;
$msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -1365,39 +1354,3 @@
return @list;
}
-sub quoted_translation
-{
- my ($lang, $string) = @_;
-
- $string =~ s/\\\"/\"/g;
-
- my $translation = $translations{$lang, $string};
- $translation = $string if !$translation;
-
- $translation =~ s/\"/\\\"/g;
- return $translation
-}
-
-sub quoted_merge_translations
-{
- if (!$MULTIPLE_OUTPUT) {
- print "Quoted only supports Multiple Output.\n";
- exit(1);
- }
-
- for my $lang (sort keys %po_files_by_lang) {
- if ( ! -e $lang ) {
- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
- }
- open INPUT, "<${FILE}" or die;
- open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
- while (<INPUT>)
- {
- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
- print OUTPUT;
- }
- close OUTPUT;
- close INPUT;
- }
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/intltool-update.in new/gnome-xgl-settings-0.9/intltool-update.in
--- old/gnome-xgl-settings-0.8/intltool-update.in 2007-01-22 17:00:34.000000000 +0100
+++ new/gnome-xgl-settings-0.9/intltool-update.in 2007-02-01 19:20:26.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.2";
+my $VERSION = "0.35.0";
my $PACKAGE = "intltool";
## Loaded modules
@@ -90,9 +90,10 @@
$| = 1;
## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = $ENV{"srcdir"} || ".";
+my $SRCDIR = ".";
my $POTFILES_in;
+$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
$POTFILES_in = "<$SRCDIR/POTFILES.in";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -123,10 +124,8 @@
&Console_Write_IntltoolHelp if $arg_count > 1;
-my $PKGNAME = FindPackageName ();
-
# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
if ($POT_ARG)
{
@@ -317,8 +316,7 @@
@buf_potfiles_ignore,
@buf_allfiles,
@buf_allfiles_sorted,
- @buf_potfiles_sorted,
- @buf_potfiles_ignore_sorted
+ @buf_potfiles_sorted
);
## Search and find all translatable files
@@ -344,7 +342,7 @@
## comparing with POTFILES.in
foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
{
- (-s "$SRCDIR/$ignore") or next;
+ (-s $ignore) or next;
if ("$ignore" eq "POTFILES.ignore")
{
@@ -353,7 +351,7 @@
}
print "Found $ignore: Ignoring files...\n" if $VERBOSE;
- open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
+ open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
while (<FILE>)
{
@@ -361,7 +359,7 @@
}
close FILE;
- @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
+ @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
}
foreach my $file (@buf_i18n_plain)
@@ -419,7 +417,7 @@
}
}
- if (/\w\.GetString *\(QUOTEDTEXT/)
+ if (/\.GetString ?\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -428,8 +426,7 @@
last;
}
- ## N_ Q_ and _ are the three macros defined in gi8n.h
- if (/[NQ]?_ *\(QUOTEDTEXT/)
+ if (/_\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -492,11 +489,6 @@
$in2{$_} = 1;
}
- foreach (@buf_potfiles_ignore_sorted)
- {
- $in2{$_} = 1;
- }
-
my @result;
foreach (@buf_allfiles_sorted)
@@ -512,7 +504,7 @@
foreach (@buf_potfiles_sorted)
{
chomp (my $dummy = $_);
- if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+ if ("$dummy" ne "" and ! -f "../$dummy")
{
push @buf_potfiles_notexist, $_;
}
@@ -545,7 +537,7 @@
warn "\n" if ($VERBOSE or @result);
warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
warn @buf_potfiles_notexist, "\n";
- warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
+ warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
"containing this list of absent files has been written in the current directory.\n";
}
}
@@ -679,8 +671,12 @@
}
else
{
- print OUTFILE "$SRCDIR/../$_\n";
- $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ if ($SRCDIR eq ".") {
+ print OUTFILE "../$_\n";
+ } else {
+ print OUTFILE "$SRCDIR/../$_\n";
+ }
+ $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
}
next if (! $gettext_support_nonascii);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/po/Makefile.in.in new/gnome-xgl-settings-0.9/po/Makefile.in.in
--- old/gnome-xgl-settings-0.8/po/Makefile.in.in 2007-01-22 17:00:34.000000000 +0100
+++ new/gnome-xgl-settings-0.9/po/Makefile.in.in 2007-02-01 19:20:26.000000000 +0100
@@ -25,7 +25,7 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+top_builddir = ..
VPATH = @srcdir@
prefix = @prefix@
@@ -56,19 +56,15 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
-# This comment gets stripped out
+#This Gets Replace for some reason
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
@@ -102,7 +98,11 @@
install-data-no: all
install-data-yes: all
$(mkdir_p) $(DESTDIR)$(itlocaledir)
- linguas="$(USE_LINGUAS)"; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
@@ -136,18 +136,17 @@
installcheck:
uninstall:
- linguas="$(USE_LINGUAS)"; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
for lang in $$linguas; do \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
- rm -f missing notexist
- srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
- if [ -r missing -o -r notexist ]; then \
- exit 1; \
- fi
mostlyclean:
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -180,7 +179,11 @@
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- linguas="$(USE_LINGUAS)"; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
@@ -208,8 +211,8 @@
$(MAKE) stamp-it; \
fi
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
- cd $(top_builddir) \
+stamp-it: Makefile.in.in ../config.status POTFILES.in
+ cd .. \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-info new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-info
--- old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-info 2007-01-19 22:51:31.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-info 2006-05-30 21:18:26.000000000 +0200
@@ -19,8 +19,21 @@
xgl_opts=""
card_status=""
-card_id=$(/sbin/lspci -mn | /usr/bin/sed -ne 's/"//g' -e 's/ /:/g' -e 's/-r//' -e 's/.*Class:0300://p')
-card_name=$(/sbin/lspci | /usr/bin/sed -ne 's/^.*VGA compatible controller: //p')
+card_info=$(hwinfo --gfxcard | \
+ awk '/0300 VGA compatible controller/ { dev = gensub(/^([^:]*):.*/, "\\1", "g"); } \
+ /^ Vendor:/ { vendor[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); \
+ name[dev] = gensub(/^.* "(.*)"$/, "\\1", "g"); } \
+ /^ Device:/ { device[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); \
+ name[dev] = name[dev] " " gensub(/^.* "(.*)"$/, "\\1", "g"); } \
+ /^ SubVendor:/ { subvendor[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); } \
+ /^ SubDevice:/ { subdevice[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); } \
+ /^ Revision:/ { revision[dev] = gensub(/.*0x(..).*/, "\\1", "g"); } \
+ /^Primary display adapter: #/ { dev = gensub(/.*#/, "", "g"); \
+ print vendor[dev] ":" device[dev] ":" revision[dev] ":" subvendor[dev] ":" \
+ subdevice[dev] " " name[dev] "\n"; }');
+
+card_id=${card_info%% *}
+card_name=${card_info#* }
cur_driver=$(perl -ne 'if (/^Section\s+"Device"/../^EndSection/) { if (/^\s*Driver\s+"(.*)"/) { print "$1\n"; } }' /etc/X11/xorg.conf)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.c new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.c
--- old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.c 2007-01-19 22:51:31.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.c 2007-02-01 18:55:32.000000000 +0100
@@ -85,7 +85,18 @@
response_cb (GtkWidget *dialog_win,
int response_id)
{
- gtk_widget_destroy (dialog_win);
+ if (response_id == GTK_RESPONSE_HELP)
+ visit_wiki ();
+ else
+ gtk_widget_destroy (dialog_win);
+}
+
+void
+notebook_switch_page (GtkNotebook *notebook,
+ GtkNotebookPage *page, guint page_num)
+{
+ gtk_widget_set_sensitive (GXGL_WIDGET ("help_button"),
+ page_num == 0);
}
int
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.glade new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.glade
--- old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.glade 2007-01-19 22:51:31.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.glade 2007-02-01 18:51:00.000000000 +0100
@@ -43,6 +43,19 @@
<property name="response_id">-7</property>
</widget>
</child>
+
+ <child>
+ <widget class="GtkButton" id="help_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-help</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-11</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -61,6 +74,7 @@
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
+ <signal name="switch_page" handler="notebook_switch_page" last_modification_time="Thu, 13 Jul 2006 17:52:01 GMT"/>
<child>
<widget class="GtkVBox" id="page_xgl">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.h new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.h
--- old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-settings.h 2007-01-22 20:26:50.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-settings.h 2007-02-01 18:51:00.000000000 +0100
@@ -39,6 +39,8 @@
#define GXGL_WIDGET(name) ((gpointer)glade_xml_get_widget (glade, (name)))
void setup_switch_page (void);
+void visit_wiki (void);
+
void setup_settings_pages (void);
void plugins_init (void);
@@ -49,6 +51,8 @@
void free_slist (GSList *slist);
/* prototypes for glade autoconnected signal handlers */
+void notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num);
+
gboolean eventbox_button_press_event (GtkWidget *widget, GdkEventButton *event,
gpointer user_data);
void switch_button_clicked (GtkButton *button, gpointer user_data);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-switch new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-switch
--- old/gnome-xgl-settings-0.8/xgl-settings/gnome-xgl-switch 2007-01-19 23:07:07.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-switch 2007-02-01 19:16:26.000000000 +0100
@@ -27,7 +27,13 @@
;;
esac
-/etc/X11/xdm/SuSEconfig.xdm || exit 1
+if [ -x /sbin/conf.d/SuSEconfig.xdm ] ; then
+ /sbin/conf.d/SuSEconfig.xdm || exit 1
+fi
+
+if [ -x /etc/X11/xdm/SuSEconfig.xdm ] ; then
+ /etc/X11/xdm/SuSEconfig.xdm || exit 1
+fi
if [ -e /opt/gnome/sbin/gdm-safe-restart ] ; then
/opt/gnome/sbin/gdm-safe-restart || exit 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/switch.c new/gnome-xgl-settings-0.9/xgl-settings/switch.c
--- old/gnome-xgl-settings-0.8/xgl-settings/switch.c 2007-01-19 22:51:31.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/switch.c 2007-02-01 19:09:39.000000000 +0100
@@ -42,7 +42,6 @@
SwitchButtonNone,
SwitchButtonDisable,
SwitchButtonEnable,
- SwitchButtonWiki,
SwitchButtonUpdateSettings,
SwitchButtonInstaller,
SwitchButtonSaX2,
@@ -55,7 +54,7 @@
GdkVisual *visual;
gboolean depth24;
int width, height;
- gboolean allowed_resolution;
+ gboolean recommended_resolution;
char *tmp, *comment;
gboolean free_comment = FALSE;
const char *supported;
@@ -63,6 +62,7 @@
ButtonState sax_button_state;
GtkButton *button = GXGL_WIDGET ("switch_button");
GtkNotebook *notebook = GXGL_WIDGET ("notebook");
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer (GXGL_WIDGET ("comments"));
GtkWidget *w;
int page;
@@ -115,15 +115,14 @@
gdk_window_get_geometry (gdk_get_default_root_window (), NULL, NULL,
&width, &height, NULL);
- allowed_resolution = (width >= 1024 && width <= 1920 && height >= 768 && height <= 1200);
+ recommended_resolution = (width <= 1920 && height <= 1200);
visual = gdk_screen_get_system_visual (gdk_screen_get_default ());
depth24 = visual->depth == 24;
if (ran_sax || (ran_installer && missing_packages)) {
- sax_advice = _("If you are having trouble fixing this, the openSUSE wiki may "
- "be able to help you.");
- sax_button_state = SwitchButtonWiki;
+ sax_advice = "";
+ sax_button_state = SwitchButtonNone;
} else if (card_status == 'G' || card_status == 'S') {
sax_advice = _("You should be able to fix this using the SaX2 configuration "
"tool. Press the button below to run SaX2.");
@@ -159,12 +158,11 @@
comment = g_strdup_printf ("%s %s", supported, _("Sorry."));
button_state = SwitchButtonNone;
} else if (card_status == 'G' || card_status == 'S') {
- if (!allowed_resolution || !depth24) {
+ if (!depth24) {
comment = g_strdup_printf (
"%s\n\n%s\n\n%s", supported,
- _("However, Xgl cannot be enabled, because your color depth "
- "and/or resolution is not within the allowed range "
- "(1024x768 - 1920x1200 resolution, 24-bit color)."),
+ _("However, Xgl cannot be enabled, because you do not have "
+ "24-bit color configured."),
sax_advice);
button_state = sax_button_state;
} else if (!accel_enabled && missing_packages && !ran_installer) {
@@ -190,13 +188,12 @@
}
free_comment = TRUE;
} else if (accel_enabled) {
- if (!allowed_resolution || !depth24) {
+ if (!depth24) {
comment = g_strdup_printf (
"%s\n\n%s",
- _("Your graphics card is not supported. Furthermore, your "
- "color depth and/or resolution is not within the allowed "
- "range (1024x768 - 1920x1200 resolution, 24-bit color). "
- "If you fix this, you may be able to run Xgl.\n\n"),
+ _("Your graphics card is not supported. Furthermore, you "
+ "do not have 24-bit color configured. If you fix this, "
+ "you may be able to run Xgl.\n\n"),
sax_advice);
free_comment = TRUE;
button_state = sax_button_state;
@@ -230,12 +227,35 @@
free_comment = TRUE;
button_state = sax_button_state;
}
- gtk_text_buffer_set_text (
- gtk_text_view_get_buffer (GTK_TEXT_VIEW (GXGL_WIDGET ("comments"))),
- comment, -1);
+ gtk_text_buffer_set_text (buffer, comment, -1);
if (free_comment)
g_free (comment);
+ if (button_state == SwitchButtonEnable && !recommended_resolution) {
+ gtk_text_buffer_insert_at_cursor (buffer, "\n\n", -1);
+ gtk_text_buffer_insert_at_cursor (
+ buffer,
+ _("NOTE: you have an extremely large screen; if Xgl is too slow "
+ "at this resolution, it may work better at lower resolutions."), -1);
+ } if (button_state == SwitchButtonDisable) {
+ gtk_text_buffer_insert_at_cursor (buffer, "\n\n", -1);
+ gtk_text_buffer_insert_at_cursor (
+ buffer,
+ _("You can configure Desktop Effects using the other tabs of " \
+ "this control panel.\n\n" \
+ "If you are seeing bugs caused by Desktop Effects, there may " \
+ "be information about fixes or workarounds at the openSUSE " \
+ "wiki, which you can visit by clicking the \"Help\" button " \
+ "below."), -1);
+ } else if (button_state != SwitchButtonNone) {
+ gtk_text_buffer_insert_at_cursor (buffer, "\n\n", -1);
+ gtk_text_buffer_insert_at_cursor (
+ buffer,
+ _("If you are having problems configuring Desktop Effects, you can " \
+ "click the \"Help\" button below to visit the troubleshooting " \
+ "page on the openSUSE wiki for advice."), -1);
+ }
+
switch (button_state) {
case SwitchButtonDisable:
gtk_button_set_image (button, gtk_image_new_from_stock (GTK_STOCK_NO,
@@ -256,13 +276,6 @@
gtk_button_set_label (button, _("Update Desktop Effects Settings"));
break;
- case SwitchButtonWiki:
- gtk_button_set_image (button,
- gtk_image_new_from_icon_name ("applications-internet",
- GTK_ICON_SIZE_BUTTON));
- gtk_button_set_label (button, _("Visit openSUSE Wiki"));
- break;
-
case SwitchButtonInstaller:
gtk_button_set_image (button,
gtk_image_new_from_icon_name ("system-software-update",
@@ -498,12 +511,6 @@
enable_disable ();
break;
- case SwitchButtonWiki:
- g_spawn_command_line_sync (
- "/usr/bin/desktop-launch http://en.opensuse.org/Xgl_Troubleshooting",
- NULL, NULL, NULL, NULL);
- break;
-
case SwitchButtonInstaller:
run_installer ();
break;
@@ -516,3 +523,11 @@
break;
}
}
+
+void
+visit_wiki (void)
+{
+ g_spawn_command_line_sync (
+ "/usr/bin/desktop-launch http://en.opensuse.org/Xgl_Troubleshooting",
+ NULL, NULL, NULL, NULL);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-xgl-settings-0.8/xgl-settings/xgl-settings-capplet.svg new/gnome-xgl-settings-0.9/xgl-settings/xgl-settings-capplet.svg
--- old/gnome-xgl-settings-0.8/xgl-settings/xgl-settings-capplet.svg 2007-01-19 22:51:31.000000000 +0100
+++ new/gnome-xgl-settings-0.9/xgl-settings/xgl-settings-capplet.svg 2007-01-30 21:35:44.000000000 +0100
@@ -7,425 +7,266 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:export-ydpi="90.000000"
- inkscape:export-xdpi="90.000000"
- inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
- width="48px"
- height="48px"
- id="svg11300"
+ width="48"
+ height="48"
+ id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.43"
- sodipodi:docbase="/home/jimmac/gfx/novell/pdes/trunk/logos/XGL"
- sodipodi:docname="xgl-icon.svg">
+ inkscape:version="0.45pre1"
+ version="1.0"
+ sodipodi:docbase="/home/jimmac/gfx/ximian/art/icons/application-icons/compiz/scalable"
+ sodipodi:docname="desktop-effects2.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ id="defs4">
+ inkscape:collect="always"
+ id="linearGradient6434">
-
+ id="stop6436" />
+ id="stop6438" />
</linearGradient>
+ id="linearGradient6307">
+ id="stop6309" />
+ id="stop6311" />
</linearGradient>
+ id="linearGradient5707">
+ style="stop-color:#a0cef7;stop-opacity:1;" />
+ style="stop-color:#4d8ed4;stop-opacity:1;" />
</linearGradient>
+ id="linearGradient5683">
+ id="stop5685" />
- </linearGradient>
-
-
-
+ id="stop5687" />
</linearGradient>
+ id="linearGradient5663">
+ id="stop5665" />
+ id="stop5667" />
</linearGradient>
+ inkscape:collect="always"
+ id="linearGradient5599">
-
- </linearGradient>
-
-
-
+ id="stop5601" />
+ id="stop5603" />
</linearGradient>
+ id="linearGradient5565">
+ id="stop5567" />
+ id="stop5569" />
</linearGradient>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ </filter>
+
+
+
-
-
-
-
-
-
-
-
+ id="filter6401">
+
+ </filter>
+
+
+
+ </filter>
+
+
+
+ </filter>
</defs>
+ inkscape:window-height="738"
+ inkscape:window-x="256"
+ inkscape:window-y="64"
+ showgrid="false" />
+ id="metadata7">
rdf:RDF
dc:formatimage/svg+xml
http://purl.org/dc/dcmitype/StillImage" />
+ dc:titleCompiz Logo (fancy)
dc:creator
cc:Agent
dc:titleJakub Steiner
- dc:sourcehttp://jimmac.musichall.cz
+ dc:descriptionBased on logo design by Srdjan Prodanovic (some1else) - http://forum.go-compiz.org/viewtopic.php?p=1839
http://creativecommons.org/licenses/by-sa/2.0/" />
-
+ rdf:resource="http://creativecommons.org/licenses/by-sa/2.5/" />
+ dc:coveragecompiz logo bling
+ dc:sourcehttp://jimmac.musichall.cz
http://creativecommons.org/licenses/by-sa/2.0/">
+ rdf:about="http://creativecommons.org/licenses/by-sa/2.5/">
http://web.resource.org/cc/Reproduction" />
</metadata>
-
-
+ inkscape:groupmode="layer"
+ id="layer1">
-
-
-
-
-
-
-
-
- </g>
-
-
+
+
+
+
+
+
-
-
</g>
</svg>
++++++ gnome-xgl-switch-md5dir.diff ++++++
--- /var/tmp/diff_new_pack.fg9112/_old 2007-02-02 15:59:45.000000000 +0100
+++ /var/tmp/diff_new_pack.fg9112/_new 2007-02-02 15:59:45.000000000 +0100
@@ -1,12 +1,23 @@
---- xgl-settings/gnome-xgl-switch.orig 2007-01-16 16:44:43.593906000 +0100
-+++ xgl-settings/gnome-xgl-switch 2007-01-16 16:49:48.684510000 +0100
-@@ -27,7 +27,8 @@
- ;;
+diff -urp ../gnome-xgl-settings-0.9.orig/xgl-settings/gnome-xgl-switch ./xgl-settings/gnome-xgl-switch
+--- ../gnome-xgl-settings-0.9.orig/xgl-settings/gnome-xgl-switch 2007-02-01 19:16:26.000000000 +0100
++++ ./xgl-settings/gnome-xgl-switch 2007-02-02 12:39:14.000000000 +0100
+@@ -28,14 +28,13 @@ case $1 in
esac
--/etc/X11/xdm/SuSEconfig.xdm || exit 1
-+MD5DIR="/var/adm/SuSEconfig/md5" \
-+/etc/X11/xdm/SuSEconfig.xdm | sed 's+\(.*\)+/usr/bin/gnome-xgl-switch: \1+g' | /bin/logger || exit 1
+ if [ -x /sbin/conf.d/SuSEconfig.xdm ] ; then
+- /sbin/conf.d/SuSEconfig.xdm || exit 1
++ /sbin/SuSEconfig --module xdm | sed "s+\(.*\)+$0: \1+g" | /bin/logger
++else
++ MD5DIR="/var/adm/SuSEconfig/md5" \
++ /etc/X11/xdm/SuSEconfig.xdm | sed "s+\(.*\)+$0: \1+g" | /bin/logger
+ fi
- if [ -e /opt/gnome/sbin/gdm-safe-restart ] ; then
+-if [ -x /etc/X11/xdm/SuSEconfig.xdm ] ; then
+- /etc/X11/xdm/SuSEconfig.xdm || exit 1
+-fi
+-
+-if [ -e /opt/gnome/sbin/gdm-safe-restart ] ; then
++if [ -x /opt/gnome/sbin/gdm-safe-restart ] ; then
/opt/gnome/sbin/gdm-safe-restart || exit 1
+ fi
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org