From e1e6dcfc33c45c08af23ff60ada8e2f79285c889 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 19 Oct 2015 20:32:12 +0300 Subject: [PATCH 1/6] Configure pkg-config.pc outside of the backbone's cmake submodule. --- cmake/backbone | 2 +- pkg-config/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/backbone b/cmake/backbone index 85724cb..df96ceb 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit 85724cbd4ef273ab6ce06507013dc5e6087023a6 +Subproject commit df96ceb0b067844d341f0405db7c10def84d772c diff --git a/pkg-config/CMakeLists.txt b/pkg-config/CMakeLists.txt index 99b14e6..d349889 100644 --- a/pkg-config/CMakeLists.txt +++ b/pkg-config/CMakeLists.txt @@ -1 +1,6 @@ INCLUDE (PkgConfigCommonRules) + +CONFIGURE_FILE ( + "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/pkg-config.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc" +) From 4e9547cd868c7327bf1bff0d44841da930c61761 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 19 Oct 2015 20:52:36 +0300 Subject: [PATCH 2/6] Fix comment. --- src/library_constructor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/library_constructor.c b/src/library_constructor.c index 86f9298..ca244e0 100644 --- a/src/library_constructor.c +++ b/src/library_constructor.c @@ -29,7 +29,7 @@ void __attribute__ ((constructor)) load_library (void) #if defined(_WIN32) || defined(_WIN64) (void) dwReason; // avoid - (void) lpReserved; // warngings + (void) lpReserved; // warnings return TRUE; #endif } From 7d07dc213562739b7b84fdc338cc9e0611b176cd Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 24 Oct 2015 19:52:28 +0300 Subject: [PATCH 3/6] submodules updated. --- cmake/backbone | 2 +- util/backbone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/backbone b/cmake/backbone index df96ceb..4b74a70 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit df96ceb0b067844d341f0405db7c10def84d772c +Subproject commit 4b74a70c2806e160ac2ae1cfe8a960cee8d490d4 diff --git a/util/backbone b/util/backbone index aa78f6d..e0eb670 160000 --- a/util/backbone +++ b/util/backbone @@ -1 +1 @@ -Subproject commit aa78f6d42c85f7f9a98a1a6273230a9775824fc7 +Subproject commit e0eb6706bf76ae7d4048c6f535fd72d4943c570b From dff4194add8df3da6e7b1db8e438736ffa21153b Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 14 Nov 2015 01:38:30 +0300 Subject: [PATCH 4/6] Change Gettext ABI automatically. --- cmake/backbone | 2 +- ...x-struct-0.pot => laview-latex-struct.pot} | 37 +++++++++++++------ ...tex-struct-0.po => laview-latex-struct.po} | 35 ++++++++++++------ util/backbone | 2 +- 4 files changed, 51 insertions(+), 25 deletions(-) rename po/{laview-latex-struct-0.pot => laview-latex-struct.pot} (71%) rename po/ru/{laview-latex-struct-0.po => laview-latex-struct.po} (81%) diff --git a/cmake/backbone b/cmake/backbone index 4b74a70..a0b6683 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit 4b74a70c2806e160ac2ae1cfe8a960cee8d490d4 +Subproject commit a0b668336067535dbb84e7e7d01b9730af429541 diff --git a/po/laview-latex-struct-0.pot b/po/laview-latex-struct.pot similarity index 71% rename from po/laview-latex-struct-0.pot rename to po/laview-latex-struct.pot index 1cc17f4..6329b2c 100644 --- a/po/laview-latex-struct-0.pot +++ b/po/laview-latex-struct.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the laview-latex-struct package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: laview-latex-struct-0\n" +"Project-Id-Version: laview-latex-struct\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 17:59+0300\n" +"POT-Creation-Date: 2015-11-13 22:13+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,56 +18,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:58 +#: src/latex-struct/GlobParser.vala:58 #, c-format msgid "Begin tag sequence '%s' without end tag pair." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:127 -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:585 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:126 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:584 +#: src/latex-struct/GlobParser.vala:127 src/latex-struct/TableParser.vala:585 #, c-format msgid ": Unexpected end tag sequence '%s' without begin tag pair." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:148 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:147 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:148 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:179 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:188 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:205 +#: src/latex-struct/GlobParser.vala:148 src/latex-struct/TableParser.vala:148 +#: src/latex-struct/TableParser.vala:179 src/latex-struct/TableParser.vala:188 +#: src/latex-struct/TableParser.vala:205 msgid "Error parsing subdoc." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:44 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:46 +#: src/latex-struct/LongtableParser.vala:47 #, c-format msgid "Incorrect longtable parameters doesn't match '%s' regexp." msgstr "" #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:298 +#: src/latex-struct/Table.vala:298 msgid "2nd param (ATable) isn't a child of the 1st (Glob)." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:312 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:311 +#: src/latex-struct/Table.vala:311 msgid "3rd param (limits) is incorrect. Read the manual." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:329 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:328 +#: src/latex-struct/Table.vala:328 msgid "Cann't split the table. Read the manual." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:416 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:415 +#: src/latex-struct/TableParser.vala:416 #, c-format msgid "Unexpected end external tag sequence '%s' without begin tag pair." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:452 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:451 +#: src/latex-struct/TableParser.vala:452 #, c-format msgid "Begin tag sequence '%s':%d:%d without end tag pair." msgstr "" -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:615 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:614 +#: src/latex-struct/TableParser.vala:615 msgid "\\cline parameters doesn't match {number-number} regexp." msgstr "" #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TabularParser.vala:43 +#: src/latex-struct/TabularParser.vala:44 #, c-format msgid "Incorrect tabular parameters doesn't match '%s' regexp." msgstr "" diff --git a/po/ru/laview-latex-struct-0.po b/po/ru/laview-latex-struct.po similarity index 81% rename from po/ru/laview-latex-struct-0.po rename to po/ru/laview-latex-struct.po index 05fe7b0..9418178 100644 --- a/po/ru/laview-latex-struct-0.po +++ b/po/ru/laview-latex-struct.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: laview-latex-struct-0\n" +"Project-Id-Version: laview-latex-struct\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-26 15:56+0300\n" +"POT-Creation-Date: 2015-11-13 22:13+0300\n" "PO-Revision-Date: 2014-05-28 10:50+0400\n" "Last-Translator: \n" "Language-Team: Russian\n" @@ -19,61 +19,74 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:58 +#: src/latex-struct/GlobParser.vala:58 #, c-format msgid "Begin tag sequence '%s' without end tag pair." msgstr "Стартовая последовательность тегов '%s' без соответствующей стоп-пары." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:127 -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:585 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:126 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:584 +#: src/latex-struct/GlobParser.vala:127 src/latex-struct/TableParser.vala:585 #, c-format msgid ": Unexpected end tag sequence '%s' without begin tag pair." msgstr "" ": Неожиданная завершающая последовательность тегов '%s' без соответствующей " "старт-пары." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:148 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:147 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:148 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:179 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:188 #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:205 +#: src/latex-struct/GlobParser.vala:148 src/latex-struct/TableParser.vala:148 +#: src/latex-struct/TableParser.vala:179 src/latex-struct/TableParser.vala:188 +#: src/latex-struct/TableParser.vala:205 msgid "Error parsing subdoc." msgstr "Ошибка разбора поддокумента." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:44 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:46 +#: src/latex-struct/LongtableParser.vala:47 #, c-format msgid "Incorrect longtable parameters doesn't match '%s' regexp." msgstr "Неверные параметры longtable не удовлетворяют рег. выражению '%s'." #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:298 +#: src/latex-struct/Table.vala:298 msgid "2nd param (ATable) isn't a child of the 1st (Glob)." msgstr "2-ой параметр (ATable) не является дочерним узлом 1-ого (Glob)." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:312 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:311 +#: src/latex-struct/Table.vala:311 msgid "3rd param (limits) is incorrect. Read the manual." msgstr "3-ий параметр (limits) не верный. Смотрите документацию." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:329 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:328 +#: src/latex-struct/Table.vala:328 msgid "Cann't split the table. Read the manual." msgstr "Невозможно разбить таблицу. Смотрите документацию." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:416 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:415 +#: src/latex-struct/TableParser.vala:416 #, c-format msgid "Unexpected end external tag sequence '%s' without begin tag pair." msgstr "" ": Неожиданная завершающая последовательность внешних тегов '%s' без " "соответствующей старт-пары." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:452 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:451 +#: src/latex-struct/TableParser.vala:452 #, c-format msgid "Begin tag sequence '%s':%d:%d without end tag pair." msgstr "" "Стартовая последовательность тегов '%s':%d:%d без соответствующей стоп-пары." -#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:615 +#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:614 +#: src/latex-struct/TableParser.vala:615 msgid "\\cline parameters doesn't match {number-number} regexp." msgstr "Параметры \\cline не соответствует рег. выражению {число-число}." #: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TabularParser.vala:43 +#: src/latex-struct/TabularParser.vala:44 #, c-format msgid "Incorrect tabular parameters doesn't match '%s' regexp." msgstr "Неверные параметры tabular не удовлетворяют рег. выражению '%s'." diff --git a/util/backbone b/util/backbone index e0eb670..d4e233a 160000 --- a/util/backbone +++ b/util/backbone @@ -1 +1 @@ -Subproject commit e0eb6706bf76ae7d4048c6f535fd72d4943c570b +Subproject commit d4e233ae72412f4dfef9b7c39ae7a1b6667fb446 From 16464aa66250de208707dbd9c52976f9588dff6e Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 14 Nov 2015 03:06:26 +0300 Subject: [PATCH 5/6] Library constructor and cmake/backbone submodule updated. --- cmake/backbone | 2 +- src/latex-struct/CMakeLists.txt | 4 +++- src/library_constructor.c | 35 --------------------------------- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 src/library_constructor.c diff --git a/cmake/backbone b/cmake/backbone index a0b6683..02f3a0f 160000 --- a/cmake/backbone +++ b/cmake/backbone @@ -1 +1 @@ -Subproject commit a0b668336067535dbb84e7e7d01b9730af429541 +Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3 diff --git a/src/latex-struct/CMakeLists.txt b/src/latex-struct/CMakeLists.txt index c376666..dc949fb 100644 --- a/src/latex-struct/CMakeLists.txt +++ b/src/latex-struct/CMakeLists.txt @@ -2,6 +2,8 @@ SET (LibName ${PROJECT_LOWERCASE_NAME}) FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala) SET (LibPackages gee-0.8 posix) SET (LibPkgModules gee-0.8) -SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c) SET (LibInstall ON) +SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c) +SET (LC_RELATIVE_PREFIX "..") +CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}") INCLUDE (ValaLibCommonRules) diff --git a/src/library_constructor.c b/src/library_constructor.c deleted file mode 100644 index ca244e0..0000000 --- a/src/library_constructor.c +++ /dev/null @@ -1,35 +0,0 @@ -#if defined(_WIN32) || defined(_WIN64) -#include -#endif - -#include "gettext-config.h" - -#if defined(_WIN32) || defined(_WIN64) -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) -#elif defined(linux) || defined(UNIX) || defined(__unix__) -void __attribute__ ((constructor)) load_library (void) -#endif -{ -#if defined(_WIN32) || defined(_WIN64) - gchar dllPath[FILENAME_MAX], - *dllDir, - *localePath; - - GetModuleFileName (hInstance, dllPath, FILENAME_MAX); - dllDir = g_path_get_dirname (dllPath); - localePath = g_build_filename (dllDir, "../share/locale", NULL); - g_free (dllDir); - bindtextdomain (GETTEXT_PACKAGE, localePath); - g_free (localePath); -#endif - -#if (!GLIB_CHECK_VERSION (2, 36, 0)) - g_type_init (); -#endif - -#if defined(_WIN32) || defined(_WIN64) - (void) dwReason; // avoid - (void) lpReserved; // warnings - return TRUE; -#endif -} From d9dbfe5e5c5684a26cd1274d641ab8d99e3f9ec1 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 14 Nov 2015 07:57:40 +0300 Subject: [PATCH 6/6] Bump version number to 0.1.9 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c88524..ed8f237 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "LaTeX representation in the memory.") SET (MAJOR 0) SET (MINOR 1) -SET (PATCH 8) +SET (PATCH 9) LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)