47 lines
1.4 KiB
Plaintext
47 lines
1.4 KiB
Plaintext
$NetBSD: patch-aa,v 1.11 2015/08/23 14:04:32 wiz Exp $
|
|
|
|
--- Makefile.orig 2015-03-24 00:38:31.000000000 +0000
|
|
+++ Makefile
|
|
@@ -263,7 +263,6 @@ EXT_PKGS = \
|
|
gstreamer-base-1.0 \
|
|
gstreamer-pbutils-1.0 \
|
|
gtk+-3.0 \
|
|
- gudev-1.0 \
|
|
libexif \
|
|
libgphoto2 \
|
|
json-glib-1.0 \
|
|
@@ -295,7 +294,6 @@ EXT_PKG_VERSIONS = \
|
|
gstreamer-plugins-base-1.0 >= 1.0.0 \
|
|
gstreamer-pbutils-1.0 >= 1.0.0 \
|
|
gtk+-3.0 >= 3.12.2 \
|
|
- gudev-1.0 >= 145 \
|
|
libexif >= 0.6.16 \
|
|
libgphoto2 >= 2.4.2 \
|
|
libraw >= 0.13.2 \
|
|
@@ -417,7 +415,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
|
|
# Required for gudev-1.0
|
|
CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
|
|
|
|
-all: pkgcheck valacheck desktop
|
|
+all: pkgcheck desktop
|
|
|
|
ifdef ENABLE_BUILD_FOR_GLADE
|
|
all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
|
|
@@ -489,7 +487,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
|
|
else rm -f misc/shotwell.desktop.errors; \
|
|
fi
|
|
endif
|
|
-
|
|
+
|
|
misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
|
|
cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
|
|
$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
|
|
@@ -694,7 +692,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
|
|
|
|
.PHONY: $(PLUGINS_DIR)
|
|
$(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
|
|
- $(call check_valac_version)
|
|
@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
|
|
PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
|
|
|