47 lines
2.1 KiB
Plaintext
47 lines
2.1 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.11 2013/03/23 15:19:45 ajacoutot Exp $
|
|
|
|
remove gudev requirement
|
|
|
|
--- Makefile.orig Mon Mar 18 21:32:30 2013
|
|
+++ Makefile Sat Mar 23 16:00:19 2013
|
|
@@ -298,7 +298,6 @@ EXT_PKGS = \
|
|
gstreamer-base-1.0 \
|
|
gstreamer-pbutils-1.0 \
|
|
gtk+-3.0 \
|
|
- gudev-1.0 \
|
|
libexif \
|
|
libgphoto2 \
|
|
json-glib-1.0 \
|
|
@@ -330,7 +329,6 @@ EXT_PKG_VERSIONS = \
|
|
gstreamer-plugins-base-1.0 >= 1.0.0 \
|
|
gstreamer-pbutils-1.0 >= 1.0.0 \
|
|
gtk+-3.0 >= 3.0.11 \
|
|
- gudev-1.0 >= 145 \
|
|
libexif >= 0.6.16 \
|
|
libgphoto2 >= 2.4.2 \
|
|
libraw >= 0.13.2 \
|
|
@@ -568,8 +566,8 @@ ifndef DISABLE_SCHEMAS_COMPILE
|
|
glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
|
|
endif
|
|
ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
|
|
- mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
|
|
- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
|
|
+ mkdir -p $(DESTDIR)$(PREFIX)/share/GConf/gsettings
|
|
+ $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)$(PREFIX)/share/GConf/gsettings
|
|
endif
|
|
ifndef DISABLE_ICON_UPDATE
|
|
-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
|
|
@@ -734,9 +732,9 @@ pkgcheck:
|
|
.PHONY: valacheck
|
|
valacheck:
|
|
@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. No valac found in path or $$VALAC.'; exit 1 )
|
|
- @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
|
|
- $(if $(MAX_VALAC_VERSION),\
|
|
- @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
|
|
+# @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
|
|
+# $(if $(MAX_VALAC_VERSION),\
|
|
+# @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
|
|
|
|
|
|
|