[PATCH] Test this update to print/gnome-cups-manager
John Merryweather Cooper
johnmary at adelphia.net
Wed Jun 9 04:48:10 GMT 2004
It took a little bit more doing, but here is print/gnome-cups-manager
version 0.18. It works quite well (better than the previous version) on
my -CURRENT machine.
jmc
-------------- next part --------------
# Update print/gnome-cups-manager to 0.18
# This version works!
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually delete
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
rm -f 'files/patch-gnome-cups-add_printerconf.c'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####
#### Patch data follows ####
diff -u '/usr/ports/print/gnome-cups-manager/Makefile' '/usr/ports/local/gnome-cups-manager/Makefile'
Index: ./Makefile
--- ./Makefile Tue Apr 27 13:17:26 2004
+++ ./Makefile Tue Jun 8 20:22:57 2004
@@ -2,14 +2,13 @@
# Date created: 14 Jul 2003
# Whom: Glenn Johnson <glennpj at charter.net>
#
-# $FreeBSD: ports/print/gnome-cups-manager/Makefile,v 1.4 2004/04/05 03:30:57 marcus Exp $
+# $FreeBSD$
PORTNAME= gnome-cups-manager
-PORTVERSION= 0.17
-PORTREVISION= 2
+PORTVERSION= 0.18
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.18
DIST_SUBDIR= gnome2
MAINTAINER= gnome at FreeBSD.org
@@ -34,6 +33,7 @@
"s|-D.*_DISABLE_DEPRECATED||g"
post-install:
+ ${MKDIR} ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \
${PREFIX}/share/gnome/applications
diff -u '/usr/ports/print/gnome-cups-manager/distinfo' '/usr/ports/local/gnome-cups-manager/distinfo'
Index: ./distinfo
--- ./distinfo Tue Apr 27 13:17:26 2004
+++ ./distinfo Tue Jun 8 18:26:32 2004
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-cups-manager-0.17.tar.bz2) = 1aa72f8318a7ccb795cdfd2676d6346c
-SIZE (gnome2/gnome-cups-manager-0.17.tar.bz2) = 316581
+MD5 (gnome2/gnome-cups-manager-0.18.tar.bz2) = d8508654ed956de73fa62a72b4358a1a
+SIZE (gnome2/gnome-cups-manager-0.18.tar.bz2) = 472324
diff -u '/usr/ports/print/gnome-cups-manager/files/gnome-cups-manager.desktop' '/usr/ports/local/gnome-cups-manager/files/gnome-cups-manager.desktop'
Index: ./files/gnome-cups-manager.desktop
--- ./files/gnome-cups-manager.desktop Tue Jul 15 21:44:15 2003
+++ ./files/gnome-cups-manager.desktop Tue Jun 8 19:04:02 2004
@@ -2,7 +2,7 @@
Encoding=UTF-8
Type=Application
Exec=gnome-cups-manager
-Icon=%%PREFIX%%/share/icons/gnome/48x48/devices/gnome-dev-printer.png
+Icon=%%PREFIX%%/share/icons/hicolor/48x48/devices/gnome-dev-printer.png
Terminal=false
Name=CUPS manager
Comment=Printer manager
diff -u '/usr/ports/print/gnome-cups-manager/files/patch-icons_Makefile.in' '/usr/ports/local/gnome-cups-manager/files/patch-icons_Makefile.in'
Index: ./files/patch-icons_Makefile.in
--- ./files/patch-icons_Makefile.in Tue Jul 15 21:44:15 2003
+++ ./files/patch-icons_Makefile.in Tue Jun 8 19:02:27 2004
@@ -1,15 +1,15 @@
---- icons/Makefile.in.orig Tue Jul 15 13:57:05 2003
-+++ icons/Makefile.in Tue Jul 15 13:58:07 2003
-@@ -118,10 +118,10 @@
+--- icons/Makefile.in.old Tue Jun 8 18:54:16 2004
++++ icons/Makefile.in Tue Jun 8 19:00:42 2004
+@@ -131,10 +131,10 @@
WARN_CFLAGS = @WARN_CFLAGS@
- cxxflags_set = @cxxflags_set@
+ WARN_CXXFLAGS = @WARN_CXXFLAGS@
--devicedir = $(datadir)/icons/gnome/48x48/devices
-+devicedir = $(prefix)/$(DATADIRNAME)/icons/gnome/48x48/devices
- device_DATA = gnome-dev-printer-network.png gnome-dev-printer-new.png
+-devicedir = $(datadir)/icons/hicolor/48x48/devices
++devicedir = $(prefix)/$(DATADIRNAME)/icons/hicolor/48x48/devices
+ device_DATA = gnome-dev-printer.png gnome-dev-printer-network.png gnome-dev-printer-new.png
--emblemdir = $(datadir)/icons/gnome/48x48/emblems
-+emblemdir = $(prefix)/$(DATADIRNAME)/icons/gnome/48x48/emblems
+-emblemdir = $(datadir)/icons/hicolor/48x48/emblems
++emblemdir = $(prefix/$(DATADIRNAME)/icons/hicolor/48x48/emblems
emblem_DATA = emblem-default.png emblem-paused.png
pixmapdir = $(datadir)/pixmaps/gnome-cups-manager
diff -u '/usr/ports/print/gnome-cups-manager/files/patch-ltmain.sh' '/usr/ports/local/gnome-cups-manager/files/patch-ltmain.sh'
Index: ./files/patch-ltmain.sh
--- ./files/patch-ltmain.sh Tue Jul 15 21:44:15 2003
+++ ./files/patch-ltmain.sh Tue Jun 8 19:41:08 2004
@@ -1,51 +1,51 @@
---- ltmain.sh.orig Sat Feb 8 08:47:44 2003
-+++ ltmain.sh Tue Jul 15 13:06:35 2003
-@@ -1075,7 +1075,7 @@
+--- ltmain.sh.old Tue Jun 8 19:21:45 2004
++++ ltmain.sh Tue Jun 8 19:40:03 2004
+@@ -1356,7 +1356,7 @@
esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1085,8 +1085,16 @@
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1371,8 +1371,16 @@
continue
;;
+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
+
-module)
module=yes
-+ build_old_libs=no
++ build_old_libs=no
continue
;;
-@@ -2503,6 +2511,9 @@
- *-*-openbsd* | *-*-freebsd*)
+@@ -3200,6 +3208,9 @@
# Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
++ *-*-freebsd*)
++ # FreeBSD doesn't need this . . .
++ ;;
+ *)
# Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4330,10 +4341,12 @@
+ if test "$build_libtool_need_lc" = "yes"; then
+@@ -5550,10 +5561,12 @@
fi
# Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
++ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
++ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -u '/usr/ports/print/gnome-cups-manager/pkg-plist' '/usr/ports/local/gnome-cups-manager/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist Tue Jul 15 21:44:15 2003
+++ ./pkg-plist Tue Jun 8 20:20:02 2004
@@ -16,11 +16,32 @@
share/gnome/gnome-cups-manager/xd2-testpage-letter.eps
share/gnome/pixmaps/gnome-cups-manager/printer-tray-normal.png
share/gnome/pixmaps/gnome-cups-manager/printer-tray-stopped.png
-share/icons/gnome/48x48/devices/gnome-dev-printer-network.png
-share/icons/gnome/48x48/devices/gnome-dev-printer-new.png
-share/icons/gnome/48x48/emblems/emblem-default.png
-share/icons/gnome/48x48/emblems/emblem-paused.png
+share/icons/hicolor/48x48/devices/gnome-dev-printer-network.png
+share/icons/hicolor/48x48/devices/gnome-dev-printer-new.png
+share/icons/hicolor/48x48/devices/gnome-dev-printer.png
+share/locale/ca/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/cs/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/de/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/el/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/en_CA/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/en_GB/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/es/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/fi/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/fr/LC_MESSAGES/gnome-cups-manager.mo
share/locale/he/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/hr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/it/LC_MESSAGES/gnome-cups-manager.mo
share/locale/ja/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/ko/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/nl/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/no/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/pa/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/pt/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sr at Latn/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/sv/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/tr/LC_MESSAGES/gnome-cups-manager.mo
+share/locale/uk/LC_MESSAGES/gnome-cups-manager.mo
@dirrm share/gnome/pixmaps/gnome-cups-manager
@dirrm share/gnome/gnome-cups-manager
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Tue Jun 8 21:43:56 2004
# Generated by : makepatch 2.00
# Recurse directories : Yes
# r 'files/patch-gnome-cups-add_printerconf.c' 548 0
# p 'Makefile' 1149 1086751377 0100644
# p 'distinfo' 135 1086744392 0100644
# p 'files/gnome-cups-manager.desktop' 230 1086746642 0100644
# p 'files/patch-icons_Makefile.in' 589 1086746547 0100644
# p 'files/patch-ltmain.sh' 1350 1086748868 0100644
# p 'pkg-plist' 1165 1086751202 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Tue Jun 8 21:43:56 2004] ####
#### Checksum: 250 9731 57279 ####
More information about the freebsd-gnome
mailing list