Date: Mon, 23 Apr 2007 00:23:38 +0200 (CEST) From: Peter Hofer <ph@desktopbsd.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/112016: MAINTAINER: sysutils/desktopbsd-tools: ia64/lrelease fix Message-ID: <20070422222338.6E2274507D@desktopbsd.net> Resent-Message-ID: <200704222250.l3MMo2o7032186@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112016
>Category: ports
>Synopsis: MAINTAINER: sysutils/desktopbsd-tools: ia64/lrelease fix
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 22 22:50:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Peter Hofer
>Release: FreeBSD 6.2-RELEASE-p1 i386
>Organization:
DesktopBSD
>Environment:
System: FreeBSD sunrise 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Sat Feb 17 23:10:39 CET 2007 peterh@sunrise:/usr/obj/usr/src/sys/DESKTOPBSD i386
>Description:
sysutils/desktopbsd-tools 1.1 currently does not build on ia64. The reason is
that open_ia64_disk.c must be compiled instead of open_disk.c in libdbsddisk. I
haven't been able to test the patch because I don't have access to an ia64
machine, but the .pro file includes the same files for compilation as the
Makefile in src/lib/libdisk from the FreeBSD sources.
The attached patch also makes prepare_build.sh use Qt3's lrelease tool when
Qt4 is installed.
>How-To-Repeat:
>Fix:
--- desktopbsd-tools-1.1-ia64-lrelease.patch begins here ---
diff -ruN desktopbsd-tools-1.1/files/patch-libdbsddisk_libdbsddisk.pro desktopbsd-tools/files/patch-libdbsddisk_libdbsddisk.pro
--- desktopbsd-tools-1.1/files/patch-libdbsddisk_libdbsddisk.pro Thu Jan 1 01:00:00 1970
+++ desktopbsd-tools/files/patch-libdbsddisk_libdbsddisk.pro Sun Apr 22 20:12:39 2007
@@ -0,0 +1,44 @@
+--- libdbsddisk/libdbsddisk.orig Sat Nov 18 16:46:03 2006
++++ libdbsddisk/libdbsddisk.pro Sat Nov 18 16:44:21 2006
+@@ -23,38 +23,12 @@
+ chunk.c \
+ create_chunk.c \
+ disk.c \
+- open_disk.c \
+ rules.c \
++ write_$${ARCH}_disk.c \
+ write_disk.c
+
+ equals(ARCH, ia64) {
+- SOURCES += open_ia64_disk.c \
+- write_ia64_disk.c
++ SOURCES += open_ia64_disk.c
+ } else {
+- SOURCES += change.c
+-}
+-
+-equals(ARCH, alpha) {
+- SOURCES += write_alpha_disk.c
+-}
+-
+-equals(ARCH, amd64) {
+- SOURCES += write_amd64_disk.c
+-}
+-
+-equals(ARCH, sparc64) {
+- SOURCES += write_sparc64_disk.c
+-}
+-
+-equals(ARCH, i386) {
+- SOURCES += write_i386_disk.c
+-}
+-
+-equals(ARCH, pc98) {
+- SOURCES += write_pc98_disk.c
+- DEFINES += PC98
+-}
+-
+-equals(ARCH, powerpc) {
+- SOURCES += write_powerpc_disk.c
++ SOURCES += open_disk.c change.c
+ }
diff -ruN desktopbsd-tools-1.1/files/patch-prepare-build.sh desktopbsd-tools/files/patch-prepare-build.sh
--- desktopbsd-tools-1.1/files/patch-prepare-build.sh Thu Jan 1 01:00:00 1970
+++ desktopbsd-tools/files/patch-prepare-build.sh Sun Apr 22 20:12:39 2007
@@ -0,0 +1,11 @@
+--- prepare_build.sh.orig Sat Aug 5 02:17:22 2006
++++ prepare_build.sh Sun Apr 22 18:10:44 2007
+@@ -2,7 +2,7 @@
+ # Run scripts that prepare for the build
+
+ printf "Compiling translation files..."
+-(cd Translation ; ./pro-generate.sh && lrelease Translation.pro) || (echo "Error compiling translation files" ; exit 1)
++(cd Translation ; ./pro-generate.sh && /usr/X11R6/bin/lrelease Translation.pro) || (echo "Error compiling translation files" ; exit 1)
+ echo "Done."
+
+ printf "Generating IDL for hardware notification..."
--- desktopbsd-tools-1.1-ia64-lrelease.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070422222338.6E2274507D>