summaryrefslogtreecommitdiff
path: root/fonts/fontconfig/patches/patch-aa
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2004-06-07 23:37:41 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2004-06-07 23:37:41 +0000
commit7e6a637bddb114f7d71fbacfb939572c26f495cf (patch)
tree9e3b43c97c2a7fbf688e438a142125328c9563cb /fonts/fontconfig/patches/patch-aa
parent4d39062e1a8fb5ebdefa2ca6a56d54411510cc70 (diff)
downloadpkgsrc-7e6a637bddb114f7d71fbacfb939572c26f495cf.tar.gz
Update to 2.2.95 development release. Several bugs have been fixed,
in particular this fixes a problem where no font matches can be found by gtk2 apps. This should fix the problem where even the gtk-demo program fails run.
Diffstat (limited to 'fonts/fontconfig/patches/patch-aa')
-rw-r--r--fonts/fontconfig/patches/patch-aa18
1 files changed, 8 insertions, 10 deletions
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index d720833d677..ce112e4eb33 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
+$NetBSD: patch-aa,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
---- Makefile.in.orig 2004-04-14 15:12:47.000000000 +0000
+--- Makefile.in.orig Sat May 29 19:43:19 2004
+++ Makefile.in
-@@ -282,12 +282,12 @@ uninstall-info-am:
+@@ -290,12 +290,12 @@ uninstall-info-am:
configDATA_INSTALL = $(INSTALL_DATA)
install-configDATA: $(config_DATA)
@$(NORMAL_INSTALL)
@@ -13,15 +13,15 @@ $NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f"; \
- $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f; \
-+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \
-+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \
++ echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \
++ $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \
done
uninstall-configDATA:
-@@ -671,16 +671,15 @@ uninstall-info: uninstall-info-recursive
-
+@@ -680,14 +680,14 @@ uninstall-info: uninstall-info-recursive
install-data-local:
+ $(mkinstalldirs) $(DESTDIR)/$(configdir)
- if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
- echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \
+ if [ -f $(DESTDIR)$(datadir)/examples/fontconfig/local.conf ]; then \
@@ -37,7 +37,5 @@ $NetBSD: patch-aa,v 1.4 2004/04/27 15:09:10 adam Exp $
+ echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \
+ $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \
fi; fi; fi
-- if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
+ if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: