projects / packages / fontforge.git / blame
| Commit | Line | Data |
|---|---|---|
| a7145d56 JB |
1 | --- fontforge-2.0.20170731/configure.ac.orig 2017-07-31 10:30:25.294015000 +0200 |
| 2 | +++ fontforge-2.0.20170731/configure.ac 2018-06-21 21:57:04.087315481 +0200 | |
| 3 | @@ -622,7 +622,7 @@ | |
| 4 | test x"${i_do_have_cairo}" = xyes && my_libs="${my_libs} ${CAIRO_LIBS}" | |
| 5 | test x"${i_do_have_cairo}" = xyes && my_libs="${my_libs} ${PANGOCAIRO_LIBS}" | |
| 6 | test x"${i_do_have_gui}" = xyes && my_libs="${my_libs} ${PANGO_LIBS}" | |
| 7 | -test x"${i_do_have_x}" = xyes && my_libs="${my_libs} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" | |
| 8 | +test x"${i_do_have_x}" = xyes && my_libs="${my_libs} ${X_LIBS} ${X_EXTRA_LIBS}" | |
| 9 | test x"${i_do_have_libreadline}" = xyes && my_libs="${my_libs} ${LIBREADLINE_LIBS}" | |
| 10 | test x"${i_do_have_libspiro}" = xyes && my_libs="${my_libs} ${LIBSPIRO_LIBS}" | |
| 11 | my_libs="${my_libs} ${LIBSPIRO_LIBS}" | |
| 12 | --- fontforge-2.0.20170731/Makefile.am.orig 2017-07-22 07:00:38.802074006 +0200 | |
| 13 | +++ fontforge-2.0.20170731/Makefile.am 2018-06-21 22:20:54.687299149 +0200 | |
| 14 | @@ -66,6 +66,7 @@ | |
| 15 | SUBDIRS += collab | |
| 16 | endif | |
| c4422ab0 | 17 | |
| a7145d56 JB |
18 | +SUBDIRS += plugins |
| 19 | SUBDIRS += fontforge | |
| c4422ab0 | 20 | |
| a7145d56 JB |
21 | if GRAPHICAL_USER_INTERFACE |
| 22 | @@ -90,7 +91,6 @@ | |
| 23 | contrib \ | |
| 24 | doc \ | |
| 25 | nodejs \ | |
| 26 | - plugins \ | |
| 27 | po \ | |
| 28 | pycontrib \ | |
| 29 | share \ | |
| 01b2c9d0 JB |
30 | --- fontforge-2.0.20170731/m4/fontforge_create_pkg-config_files.m4.orig 2017-07-22 07:00:39.158252006 +0200 |
| 31 | +++ fontforge-2.0.20170731/m4/fontforge_create_pkg-config_files.m4 2018-06-24 09:03:38.755879927 +0200 | |
| 32 | @@ -30,7 +30,7 @@ | |
| 33 | test x"${i_do_have_libuninameslist}" = xyes && test x"${with_libuninameslist}" != xno && __private_deps="${__private_deps} ${LIBUNINAMESLIST_LIBS}" | |
| 34 | test x"${i_do_have_libunicodenames}" = xyes && __private_deps="${__private_deps} ${LIBUNICODENAMES_LIBS}" | |
| 35 | test x"${i_do_have_libreadline}" = xyes && test x"${with_libreadline}" != xno && __private_deps="${__private_deps} ${LIBREADLINE_LIBS}" | |
| 36 | -test x"${i_do_have_x}" = xyes && __private_deps="${__private_deps} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" | |
| 37 | +test x"${i_do_have_x}" = xyes && __private_deps="${__private_deps} ${X_LIBS} ${X_EXTRA_LIBS}" | |
| 38 | __private_deps="${__private_deps} ${PTHREAD_LIBS}" | |
| 39 | __private_deps="${__private_deps} ${LIBLTDL}" | |
| 40 | __private_deps="${__private_deps} ${LIBS}" | |
| 41 | @@ -41,14 +41,14 @@ | |
| 42 | AC_SUBST([LIBFONTFORGE_PKGCONFIG_VERSION],["${__cleaned_version}"]) | |
| 43 | AC_SUBST([LIBFONTFORGE_PKGCONFIG_REQUIRES],[]) | |
| 44 | AC_SUBST([LIBFONTFORGE_PKGCONFIG_REQUIRES_PRIVATE],["${__pkg_deps}"]) | |
| 45 | -AC_SUBST([LIBFONTFORGE_PKGCONFIG_LIBS],["-L${libdir} -lfontforge"]) | |
| 46 | +AC_SUBST([LIBFONTFORGE_PKGCONFIG_LIBS],["-lfontforge"]) | |
| 47 | AC_SUBST([LIBFONTFORGE_PKGCONFIG_LIBS_PRIVATE],["${__private_deps}"]) | |
| 48 | ||
| 49 | AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_VERSION],["${__cleaned_version}"]) | |
| 50 | AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_REQUIRES],[]) | |
| 51 | AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_REQUIRES_PRIVATE],["libfontforge ${__pkg_deps}"]) | |
| 52 | -AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS],["-L${libdir} -lfontforgeexe"]) | |
| 53 | -AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS_PRIVATE],["-L${libdir} ${__private_exe_deps} ${__private_deps}"]) | |
| 54 | +AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS],["-lfontforgeexe"]) | |
| 55 | +AC_SUBST([LIBFONTFORGEEXE_PKGCONFIG_LIBS_PRIVATE],["${__private_exe_deps} ${__private_deps}"]) | |
| 56 | ||
| 57 | AC_CONFIG_FILES([libfontforge.pc]) | |
| 58 | AC_CONFIG_FILES([libfontforgeexe.pc]) |