Nevar pievienot vairāk kā 25 tēmas
Tēmai ir jāsākas ar burtu vai ciparu, tā var saturēt domu zīmes ('-') un var būt līdz 35 simboliem gara.
73 rindas
3.5 KiB
73 rindas
3.5 KiB
Index: builds/unix/freetype-config.in |
|
--- builds/unix/freetype-config.in.orig 2015-10-10 20:04:58.775704000 +0200 |
|
+++ builds/unix/freetype-config.in 2015-10-10 20:06:48.215801536 +0200 |
|
@@ -123,20 +123,20 @@ |
|
fi |
|
|
|
if test "$echo_ft_version" = "yes" ; then |
|
- major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ |
|
+ major=`grep define ${SYSROOT}$includedir/freetype/freetype.h \ |
|
| grep FREETYPE_MAJOR \ |
|
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` |
|
- minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ |
|
+ minor=`grep define ${SYSROOT}$includedir/freetype/freetype.h \ |
|
| grep FREETYPE_MINOR \ |
|
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` |
|
- patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ |
|
+ patch=`grep define ${SYSROOT}$includedir/freetype/freetype.h \ |
|
| grep FREETYPE_PATCH \ |
|
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` |
|
echo $major.$minor.$patch |
|
fi |
|
|
|
if test "$echo_cflags" = "yes" ; then |
|
- echo -I${SYSROOT}$includedir/freetype2 |
|
+ echo -I${SYSROOT}$includedir/freetype |
|
fi |
|
|
|
if test "$echo_libs" = "yes" ; then |
|
Index: builds/unix/freetype2.in |
|
--- builds/unix/freetype2.in.orig 2015-10-10 20:04:58.775704000 +0200 |
|
+++ builds/unix/freetype2.in 2015-10-10 20:06:20.776397924 +0200 |
|
@@ -11,4 +11,4 @@ |
|
Requires.private: %REQUIRES_PRIVATE% |
|
Libs: -L${libdir} -lfreetype |
|
Libs.private: %LIBS_PRIVATE% |
|
-Cflags: -I${includedir}/freetype2 |
|
+Cflags: -I${includedir}/freetype |
|
Index: builds/unix/install.mk |
|
--- builds/unix/install.mk.orig 2015-10-10 20:04:58.775704000 +0200 |
|
+++ builds/unix/install.mk 2015-10-10 20:05:46.825720813 +0200 |
|
@@ -32,7 +32,7 @@ |
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2 |
|
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ |
|
$(DESTDIR)$(libdir)/pkgconfig \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/config \ |
|
+ $(DESTDIR)$(includedir)/freetype/config \ |
|
$(DESTDIR)$(bindir) \ |
|
$(DESTDIR)$(datadir)/aclocal \ |
|
$(DESTDIR)$(mandir)/man1 |
|
@@ -40,18 +40,18 @@ |
|
$(PROJECT_LIBRARY) $(DESTDIR)$(libdir) |
|
-for P in $(PUBLIC_H) ; do \ |
|
$(INSTALL_DATA) \ |
|
- $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \ |
|
+ $$P $(DESTDIR)$(includedir)/freetype ; \ |
|
done |
|
-for P in $(CONFIG_H) ; do \ |
|
$(INSTALL_DATA) \ |
|
- $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \ |
|
+ $$P $(DESTDIR)$(includedir)/freetype/config ; \ |
|
done |
|
$(INSTALL_DATA) $(TOP_DIR)/include/ft2build.h \ |
|
- $(DESTDIR)$(includedir)/freetype2/ft2build.h |
|
+ $(DESTDIR)$(includedir)/freetype/ft2build.h |
|
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h |
|
+ $(DESTDIR)$(includedir)/freetype/config/ftconfig.h |
|
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \ |
|
- $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h |
|
+ $(DESTDIR)$(includedir)/freetype/config/ftmodule.h |
|
$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ |
|
$(DESTDIR)$(bindir)/freetype-config |
|
$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
|
|
|