Somehow the hurd stuff got accidently left out of the version of the
patch I posted. A revised version is attatched (still not actually
tested on hurd because I don't currently have a usable debian hurd system).
Since hurd is not a release architecture there is no hurry in uploading
the revised version of this patch.
Description: Fixes for non-linux ports
Add support for freebsd and hurd (hurd untested) to makefile
.
Disable camera support (which appears to depend heavilly on gudev which in turn
depends on udev which is linux specific) on freebsd and hurd
.
Fix a build issue with camera support disabled
Author: Peter Green <plugw...@p10link.net>
Index: shotwell-0.5.2+dfsg/Makefile
===================================================================
--- shotwell-0.5.2+dfsg.orig/Makefile 2010-05-12 02:36:21.000000000 +0000
+++ shotwell-0.5.2+dfsg/Makefile 2010-05-26 23:27:27.000000000 +0000
@@ -20,6 +20,19 @@
ifeq "$(SYSTEM)" "Linux"
LINUX = 1
+ NIX = 1
+endif
+
+ifeq "$(SYSTEM)" "GNU/kFreeBSD"
+ KFBSD = 1
+ USER_VALAFLAGS += -D NO_CAMERA
+ NIX = 1
+endif
+
+ifeq "$(SYSTEM)" "GNU"
+ HURD = 1
+ USER_VALAFLAGS += -D NO_CAMERA
+ NIX = 1
endif
ifeq "$(SYSTEM)" "MinGW"
@@ -95,7 +108,7 @@
PicasaConnector.vala \
Screensaver.vala
-ifndef LINUX
+ifndef NIX
SRC_FILES += \
GConf.vala
endif
@@ -155,6 +168,10 @@
sqlite3
ifdef LINUX
+EXT_PKGS += gudev-1.0
+endif
+
+ifdef NIX
EXT_PKGS += \
gconf-2.0 \
libgphoto2 \
@@ -163,7 +180,6 @@
unique-1.0 \
webkit-1.0 \
libusb \
- gudev-1.0 \
dbus-glib-1
endif
@@ -179,6 +195,10 @@
sqlite3 >= 3.5.9
ifdef LINUX
+ EXT_PKG_VERSIOS += gudev-1.0 >= 145
+endif
+
+ifdef NIX
EXT_PKG_VERSIONS += \
gconf-2.0 >= 2.22.0 \
libgphoto2 >= 2.4.2 \
@@ -187,7 +207,6 @@
unique-1.0 >= 1.0.0 \
webkit-1.0 >= 1.1.5 \
libusb >= 0.1.12 \
- gudev-1.0 >= 145 \
dbus-glib-1 >= 0.80
endif
@@ -334,7 +353,7 @@
ifndef DISABLE_DESKTOP_UPDATE
-update-desktop-database || :
endif
-ifdef LINUX
+ifdef NIX
ifndef DISABLE_SCHEMAS_INSTALL
GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas
else
@@ -355,7 +374,7 @@
ifndef DISABLE_DESKTOP_UPDATE
-update-desktop-database || :
endif
-ifdef LINUX
+ifdef NIX
ifndef DISABLE_SCHEMAS_INSTALL
GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule misc/shotwell.schemas
else
Index: shotwell-0.5.2+dfsg/src/main.vala
===================================================================
--- shotwell-0.5.2+dfsg.orig/src/main.vala 2010-05-12 02:36:21.000000000 +0000
+++ shotwell-0.5.2+dfsg/src/main.vala 2010-05-26 23:26:14.000000000 +0000
@@ -17,7 +17,9 @@
switch (command) {
case ShotwellCommand.MOUNTED_CAMERA:
- LibraryWindow.get_app().mounted_camera_shell_notification(data.get_text());
+ #if !NO_CAMERA
+ LibraryWindow.get_app().mounted_camera_shell_notification(data.get_text());
+ #endif
break;
case Unique.Command.ACTIVATE:
