corrected dependency library flags for packages cairo and gtk (by Zdenek Hutyra)

src/cairo.mk

@@ -65,6 +65,6 @@ define $(PKG)_BUILD
         --enable-pdf \
         --enable-svg \
         --disable-pthread \
-        LIBS="-lmsimg32 `$(TARGET)-pkg-config pixman-1 --libs`"
+        LIBS="-lmsimg32 -lgdi32 `$(TARGET)-pkg-config pixman-1 --libs`"
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef

src/gtk.mk

@@ -50,7 +50,7 @@ define $(PKG)_BUILD
     $(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
     $(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
     $(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
-    $(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure'
+    $(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure'
     $(SED) 's/-Wl,-luuid/-luuid/' -i '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'