[poppler] glib/CMakeLists.txt glib/demo glib/poppler-document.cc glib/poppler-document.h glib/poppler-form-field.cc glib/poppler-form-field.h glib/poppler.h glib/reference

2023-06-29 Thread GitLab Mirror 
 glib/CMakeLists.txt |6 
 glib/demo/CMakeLists.txt|1 
 glib/demo/main.c|4 
 glib/demo/signature.c   |  437 ++
 glib/demo/signature.h   |   31 +
 glib/poppler-document.cc|   98 +++
 glib/poppler-document.h |5 
 glib/poppler-form-field.cc  | 1088 
 glib/poppler-form-field.h   |  114 +++
 glib/poppler.h  |5 
 glib/reference/poppler-sections.txt |   51 +
 glib/reference/poppler.types|2 
 12 files changed, 1840 insertions(+), 2 deletions(-)

New commits:
commit bdd922b7caaa965828e0e45a6cde0b1585c9740e
Author: Jan-Michael Brummer 
Date:   Wed Oct 5 08:20:13 2022 +0200

Signatures: Add signing API to glib part

Rectangle corrections by Marek Kasik

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 52e8687a..4e17440c 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -99,6 +99,10 @@ target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 
${CAIRO_LIBRARIES} F
 target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS})
 install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION 
${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
+if (ENABLE_NSS3)
+target_include_directories(poppler-glib SYSTEM PRIVATE 
${NSS3_INCLUDE_DIRS})
+endif()
+
 install(FILES
   ${poppler_glib_public_headers}
   ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h
@@ -150,3 +154,5 @@ endif ()
 if(ENABLE_GTK_DOC)
   add_subdirectory(reference)
 endif()
+
+check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
\ No newline at end of file
diff --git a/glib/demo/CMakeLists.txt b/glib/demo/CMakeLists.txt
index 4c1ae9a5..1520d840 100644
--- a/glib/demo/CMakeLists.txt
+++ b/glib/demo/CMakeLists.txt
@@ -18,6 +18,7 @@ set(poppler_glib_demo_SRCS
   layers.c
   selections.c
   taggedstruct.c
+  signature.c
 )
 poppler_add_test(poppler-glib-demo BUILD_GTK_TESTS ${poppler_glib_demo_SRCS})
 
diff --git a/glib/demo/main.c b/glib/demo/main.c
index e7fdea13..9b95b3ed 100644
--- a/glib/demo/main.c
+++ b/glib/demo/main.c
@@ -38,6 +38,7 @@
 #include "find.h"
 #include "print.h"
 #include "selections.h"
+#include "signature.h"
 
 enum
 {
@@ -69,7 +70,8 @@ static const PopplerGlibDemo demo_list[] = { { "Info", 
pgd_info_create_widget },
  { "Text", pgd_text_create_widget 
},
  { "Tagged Structure", 
pgd_taggedstruct_create_widget },
  { "Find", pgd_find_create_widget 
},
- { "Print", 
pgd_print_create_widget } };
+ { "Print", 
pgd_print_create_widget },
+ { "Signature", 
pgd_signature_create_widget } };
 
 static void pgd_demo_changed(GtkTreeSelection *selection, GtkNotebook 
*notebook)
 {
diff --git a/glib/demo/signature.c b/glib/demo/signature.c
new file mode 100644
index ..15c68c5a
--- /dev/null
+++ b/glib/demo/signature.c
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2022-2023 Jan-Michael Brummer 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, 
USA.
+ */
+
+#include 
+#include 
+
+#include "signature.h"
+#include "utils.h"
+
+typedef struct
+{
+PopplerDocument *doc;
+PopplerPage *page;
+GtkWidget *darea;
+cairo_surface_t *surface;
+gint num_page;
+gint redraw_idle;
+GdkPoint start;
+GdkPoint stop;
+gboolean started;
+GdkCursorType cursor;
+GtkWidget *main_box;
+gdouble scale;
+} PgdSignatureDemo;
+
+/* Render area */
+static cairo_surface_t *pgd_signature_render_page(PgdSignatureDemo *demo)
+{
+cairo_t *cr;
+PopplerPage *page;
+gdouble width, height;
+cairo_surface_t *surface = NULL;
+
+page = poppler_document_get_page(demo->doc, demo->num_page);
+if (!page) {
+return NULL;
+}
+
+poppler_page_get_size(page, , );
+
+width *= demo->scale;
+height *= demo->scale;
+gtk_widget_set_size_request(demo->darea, width, height);
+
+surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height);
+cr = cairo_create(surface);
+
+if

[poppler] glib/CMakeLists.txt test/CMakeLists.txt utils/CMakeLists.txt

2022-12-03 Thread GitLab Mirror 
 glib/CMakeLists.txt  |1 +
 test/CMakeLists.txt  |3 +++
 utils/CMakeLists.txt |1 +
 3 files changed, 5 insertions(+)

New commits:
commit 9bd49f486ed8442943a08cfee42136a5575c6a1b
Author: Albert Astals Cid 
Date:   Sun Dec 4 03:22:52 2022 +0100

cmake: Add CAIRO_INCLUDE_DIRS to the appropriate targets

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index e28d43ab..52e8687a 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -96,6 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS)
 set_target_properties(poppler-glib PROPERTIES SUFFIX 
"-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif()
 target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} 
Freetype::Freetype)
+target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS})
 install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION 
${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(FILES
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6243c56d..8334d0f5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,6 +23,7 @@ if (GTK_FOUND)
   )
   poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS})
   target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib 
PkgConfig::GTK3)
+  target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS})
 
   if (HAVE_CAIRO)
 
@@ -34,6 +35,7 @@ if (GTK_FOUND)
 )
 poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS})
 target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype 
${common_libs} PkgConfig::GTK3 poppler)
+target_include_directories(pdf-inspector SYSTEM PRIVATE 
${CAIRO_INCLUDE_DIRS})
 target_compile_definitions(pdf-inspector PRIVATE 
-DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
   endif ()
 
@@ -62,6 +64,7 @@ if (HAVE_CAIRO)
   )
 add_executable(cairo-thread-test ${cairo_thread_test_SRCS})
 target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} 
Freetype::Freetype Threads::Threads poppler)
+target_include_directories(cairo-thread-test SYSTEM PRIVATE 
${CAIRO_INCLUDE_DIRS})
   endif ()
 endif ()
 
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 34696e93..314c848c 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -39,6 +39,7 @@ if (HAVE_CAIRO)
   add_definitions(${CAIRO_CFLAGS})
   add_executable(pdftocairo ${pdftocairo_SOURCES})
   target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype 
${common_libs})
+  target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS})
   if(LCMS2_FOUND)
 target_link_libraries(pdftocairo ${LCMS2_LIBRARIES})
 target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR})

[poppler] glib/CMakeLists.txt

2022-06-20 Thread GitLab Mirror 
 glib/CMakeLists.txt |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 188aa1f8547e945752344e4e2294d4eafa167018
Author: Fabian Keßler 
Date:   Mon Jun 20 18:55:31 2022 +

Fixes 2 MSVC compilation bugs

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index a9d47342..1fbfcf0a 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -18,7 +18,7 @@ add_definitions(
 
 configure_file(poppler-features.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY)
 
-if (GTK_FOUND AND BUILD_GTK_TESTS)
+if (GTK_FOUND AND BUILD_GTK_TESTS AND NOT MSVC)
   add_subdirectory(demo)
   add_subdirectory(tests)
 endif ()
@@ -39,7 +39,7 @@ set(poppler_glib_public_headers
 )
 
 find_program(GLIB2_MKENUMS glib-mkenums)
-find_program(GLIB2_MKENUMS_PYTHON python3)
+find_program(GLIB2_MKENUMS_PYTHON NAMES python3 python)
 
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h

[poppler] glib/CMakeLists.txt

2022-01-31 Thread GitLab Mirror 
 glib/CMakeLists.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9d5731ba254f35e2d94b628c51e48c50a945271
Author: Fabrice Fontaine 
Date:   Mon Jan 24 09:28:20 2022 +0100

glib/CMakeLists.txt: allow the user to configure INTROSPECTION_COMPILER_ARGS

Allow the user to add its own parameters such as
--includedir=$(STAGING_DIR)/usr/share/gir-1.0 to
INTROSPECTION_COMPILER_ARGS to avoid the following build failure when
cross-compiling with buildroot:

[ 98%] Generating Poppler-0.18.typelib
Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use 
--includedir
error parsing file 
/home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir:
 Failed to parse included gir GObject-2.0
If the above error message is about missing .so libraries, then setting up 
GIR_EXTRA_LIBS_PATH in the .mk file should help.
Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"

Fixes:
 - 
http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e

Signed-off-by: Fabrice Fontaine 

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 7510e69e..f5130e3c 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -119,7 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
   # General gir: Reset object-list for introspection & load tool args
   set(INTROSPECTION_GIRS)
   set(INTROSPECTION_SCANNER_ARGS 
"--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
-  set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
+  set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} 
"--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
 
   # Poppler: Assign package to gir & export keys
   set(Poppler_0_18_gir "poppler-glib")

[poppler] glib/CMakeLists.txt

2022-01-20 Thread GitLab Mirror 
 glib/CMakeLists.txt |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4d2fa9808f48733432ead92f7a45be2974bc1984
Author: Albert Astals Cid 
Date:   Wed Jan 19 15:27:50 2022 +0100

Fix glib compilation on MSVC

glib-mkenums is a python script and you can't tell Windows to run those,
so tell windows to run python with glib-mkenums as script to run

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 45b275c8..7510e69e 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -39,11 +39,13 @@ set(poppler_glib_public_headers
 )
 
 find_program(GLIB2_MKENUMS glib-mkenums)
+find_program(GLIB2_MKENUMS_PYTHON python3)
 
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h
-  COMMAND ${GLIB2_MKENUMS}
+  COMMAND ${GLIB2_MKENUMS_PYTHON}
   ARGS
+${GLIB2_MKENUMS}
 --template poppler-enums.h.template
 ${poppler_glib_public_headers} > 
${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -53,8 +55,9 @@ add_custom_command(
 
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
-  COMMAND ${GLIB2_MKENUMS}
+  COMMAND ${GLIB2_MKENUMS_PYTHON}
   ARGS
+${GLIB2_MKENUMS}
 --template poppler-enums.c.template
 ${poppler_glib_public_headers} > 
${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

[poppler] glib/CMakeLists.txt

2019-05-28 Thread GitLab Mirror 
 glib/CMakeLists.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9481c4733db409c755afee6de0cb784934267dc3
Author: maxice8 
Date:   Fri Feb 8 16:01:59 2019 -0200

glib: pass poppler to gir libs.

Fixes cross compilation of gir in Void Linux

[ 85%] Generating Poppler-0.18.gir
g-ir-scanner: link: aarch64-linux-gnu-gcc -o 
/builddir/poppler-0.74.0/build/glib/tmp-introspectfs1jd4m9/Poppler-0.18 
-fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a 
-I/usr/aarch64-linux-gnu/usr/include 
/builddir/poppler-0.74.0/build/glib/tmp-introspectfs1jd4m9/Poppler-0.18.o -L. 
-Wl,-rpath,. -Wl,--no-as-needed -L/builddir/poppler-0.74.0/build 
-Wl,-rpath,/builddir/poppler-0.74.0/build -L/builddir/poppler-0.74.0/build/glib 
-Wl,-rpath,/builddir/poppler-0.74.0/build/glib -lpoppler-glib -lgio-2.0 
-lgobject-2.0 -Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0 
-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/aarch64-linux-gnu/usr/lib
/usr/lib/gcc/aarch64-linux-gnu/8.2.0/../../../../aarch64-linux-gnu/bin/ld: 
warning: libpoppler.so.85, needed by ./libpoppler-glib.so, not found (try using 
-rpath or -rpath-link)
/usr/lib/gcc/aarch64-linux-gnu/8.2.0/../../../../aarch64-linux-gnu/bin/ld: 
./libpoppler-glib.so: undefined reference to `FormWidgetText::noSpellCheck() 
const'

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 6f91669d..ca5021f7 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -135,7 +135,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
   get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
   _list_prefix(_includes _tmp_includes "-I")
   set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} 
-L${CMAKE_CURRENT_BINARY_DIR})
-  set(Poppler_0_18_gir_LIBS poppler-glib)
+  set(Poppler_0_18_gir_LIBS poppler-glib poppler)
   _list_prefix(_abs_introspection_files introspection_files 
"${CMAKE_CURRENT_SOURCE_DIR}/")
   list(APPEND _abs_introspection_files
 ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt

2018-10-22 Thread GitLab Mirror 
 glib/CMakeLists.txt |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0e012fcdc3258fe788cf53053bb1fe33846285f1
Author: Christian Persch 
Date:   Mon Oct 22 18:33:38 2018 +0200

glib: Install missing header

https://gitlab.freedesktop.org/poppler/poppler/issues/647

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 97317f03..beae865a 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -31,6 +31,7 @@ set(poppler_glib_public_headers
   poppler-form-field.h
   poppler-annot.h
   poppler-layer.h
+  poppler-macros.h
   poppler-movie.h
   poppler-media.h
   poppler.h
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt

2017-09-24 Thread Carlos Garcia Campos 
 glib/CMakeLists.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cceb80b353ca748d1e04373d238195fd548319b8
Author: Carlos Garcia Campos 
Date:   Sun Sep 24 08:24:44 2017 +0200

glib: Make g-ir-scanner always link to the libs in build directory

It was using the installed libraries, causing a build failure when
there's new API added to the poppler core.

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index a6a0ab62..1f06fec8 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -118,7 +118,7 @@ if (HAVE_INTROSPECTION)
   set(Poppler_0_18_gir_INCLUDES GObject-2.0 Gio-2.0 cairo-1.0)
   get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
   _list_prefix(_includes _tmp_includes "-I")
-  set(Poppler_0_18_gir_CFLAGS ${_includes})
+  set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR})
   set(Poppler_0_18_gir_LIBS poppler-glib)
   _list_prefix(_abs_introspection_files introspection_files 
"${CMAKE_CURRENT_SOURCE_DIR}/")
   list(APPEND _abs_introspection_files
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt glib/demo

2014-02-09 Thread Albert Astals Cid 
 glib/CMakeLists.txt  |2 ++
 glib/demo/CMakeLists.txt |1 +
 2 files changed, 3 insertions(+)

New commits:
commit a865f13def88153fdbe8a0a054d2005e3e2bb737
Author: Albert Astals Cid aa...@kde.org
Date:   Sun Feb 9 23:22:07 2014 +0100

Fix cmake build

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index a3a9d4c..35a6197 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -30,6 +30,7 @@ set(poppler_glib_public_headers
   poppler-movie.h
   poppler-media.h
   poppler.h
+  poppler-structure-element.h
 )
 
 find_program(GLIB2_MKENUMS glib-mkenums)
@@ -71,6 +72,7 @@ set(poppler_glib_SRCS
   poppler.cc
   poppler-cached-file-loader.cc
   poppler-input-stream.cc
+  poppler-structure-element.cc
 )
 set(poppler_glib_generated_SRCS
   ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
diff --git a/glib/demo/CMakeLists.txt b/glib/demo/CMakeLists.txt
index 316371e..465021a 100644
--- a/glib/demo/CMakeLists.txt
+++ b/glib/demo/CMakeLists.txt
@@ -23,6 +23,7 @@ set(poppler_glib_demo_SRCS
   attachments.c
   layers.c
   selections.c
+  taggedstruct.c
 )
 poppler_add_test(poppler-glib-demo BUILD_GTK_TESTS ${poppler_glib_demo_SRCS})
 target_link_libraries(poppler-glib-demo poppler-glib ${GTK3_LIBRARIES})
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt

2012-05-21 Thread Albert Astals Cid 
 glib/CMakeLists.txt |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 794e89ed41d03997778fc4c59b7f1ba557b5e6b7
Author: Albert Astals Cid aa...@kde.org
Date:   Mon May 21 20:18:42 2012 +0200

Compile

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 92e23bd..9831fe7 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -69,6 +69,8 @@ set(poppler_glib_SRCS
   poppler-movie.cc
   poppler-media.cc
   poppler.cc
+  poppler-cached-file-loader.cc
+  poppler-input-stream.cc
 )
 set(poppler_glib_generated_SRCS
   ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt glib/Makefile.am

2012-02-04 Thread Carlos Garcia Campos 
 glib/CMakeLists.txt |2 +-
 glib/Makefile.am|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit df89de61b7d01f0f816e773cdb809faa3053e962
Author: Hib Eris h...@hiberis.nl
Date:   Tue Jan 31 20:01:30 2012 +0100

glib: Exclude poppler-private.h from introspection files

Fixes bug #45455.

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index bc46b4d..0addd86 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -106,7 +106,7 @@ if (HAVE_INTROSPECTION)
   set(INTROSPECTION_SCANNER_ARGS 
--add-include-path=${CMAKE_CURRENT_SOURCE_DIR})
   set(INTROSPECTION_COMPILER_ARGS --includedir=${CMAKE_CURRENT_SOURCE_DIR})
 
-  set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers} 
poppler-private.h)
+  set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers})
   set(Poppler_0_18_gir poppler-glib)
   set(Poppler_0_18_gir_INCLUDES GObject-2.0 cairo-1.0)
   get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 5c357bc..8aa2724 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -91,7 +91,7 @@ INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
-introspection_files = $(libpoppler_glib_la_SOURCES) 
$(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
+introspection_files = $(filter-out poppler-private.h, 
$(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) 
$(nodist_poppler_glib_include_HEADERS)
 Poppler-0.18.gir: libpoppler-glib.la
 Poppler_0_18_gir_INCLUDES = GObject-2.0 cairo-1.0
 Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt glib/demo

2010-07-22 Thread Pino Toscano 
 glib/CMakeLists.txt  |5 +++--
 glib/demo/CMakeLists.txt |5 -
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d0a6f9abdab88ec43004b6766337db304cbf6a25
Author: Pino Toscano p...@kde.org
Date:   Thu Jul 22 21:28:55 2010 +0200

[CMake] improve the way include dirs and cflags for gdk and gtk are set

correctly include_directories() for the include dirs, while add the cflags 
which are not include dirs as definitions

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index f3b180e..fded2e8 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -6,14 +6,15 @@ include_directories(
 )
 add_definitions(
   -DG_LOG_DOMAIN=\Poppler\
-  ${GLIB2_CFLAGS_OTHERS}
+  ${GLIB2_CFLAGS_OTHER}
   ${CAIRO_CFLAGS}
   ${POPPLER_GLIB_DISABLE_DEPRECATED}
   ${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES}
 )
 
 if (GDK_FOUND)
-  add_definitions(${GDK2_CFLAGS})
+  include_directories(${GDK2_INCLUDE_DIRS})
+  add_definitions(${GDK2_CFLAGS_OTHER})
 endif (GDK_FOUND)
 
 configure_file(poppler-features.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY)
diff --git a/glib/demo/CMakeLists.txt b/glib/demo/CMakeLists.txt
index 4d12822..286fbd7 100644
--- a/glib/demo/CMakeLists.txt
+++ b/glib/demo/CMakeLists.txt
@@ -1,5 +1,8 @@
+include_directories(
+  ${GTK2_INCLUDE_DIRS}
+)
 
-add_definitions(${GTK2_CFLAGS})
+add_definitions(${GTK2_CFLAGS_OTHER})
 
 set(poppler_glib_demo_SRCS
   main.c
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt glib/poppler-features.h.cmake

2010-01-26 Thread Albert Astals Cid 
 glib/CMakeLists.txt   |1 +
 glib/poppler-features.h.cmake |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 428cc965c17f167ea00540beeaeaac5c3e426686
Author: Albert Astals Cid aa...@kde.org
Date:   Tue Jan 26 21:01:32 2010 +

Add POPPLER_WITH_GDK in cmake build system

Bug 26247

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 206610b..3290377 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -9,6 +9,7 @@ set (CAIRO_FEATURE #define POPPLER_HAS_CAIRO 1)
 add_definitions(${CAIRO_CFLAGS})
 
 if (GDK_FOUND)
+  set (GDK_FEATURE #define POPPLER_WITH_GDK 1)
   add_definitions(${GDK2_CFLAGS})
 endif (GDK_FOUND)
 
diff --git a/glib/poppler-features.h.cmake b/glib/poppler-features.h.cmake
index 1f79ce4..ed5569c 100644
--- a/glib/poppler-features.h.cmake
+++ b/glib/poppler-features.h.cmake
@@ -19,6 +19,7 @@
 #ifndef __POPPLER_FEATURES_H__
 #define __POPPLER_FEATURES_H__
 
+...@gdk_feature@
 @CAIRO_FEATURE@
 
 #define POPPLER_MAJOR_VERSION (@POPPLER_MAJOR_VERSION@)
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt

2010-01-24 Thread Albert Astals Cid 
 glib/CMakeLists.txt |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cf045acf46307d51fb6d9959451b53681e6cac03
Author: Albert Astals Cid aa...@kde.org
Date:   Sun Jan 24 19:01:52 2010 +

compile

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 6ed9523..ceef25e 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -90,6 +90,7 @@ if (CAIRO_FOUND)
   set(poppler_glib_SRCS ${poppler_glib_SRCS}
 ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc
 ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc
+${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
   )
 endif (CAIRO_FOUND)
 add_library(poppler-glib SHARED ${poppler_glib_SRCS})
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler

[poppler] glib/CMakeLists.txt glib/Makefile.am

2008-09-09 Thread Albert Astals Cid 
 glib/CMakeLists.txt |2 +-
 glib/Makefile.am|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16c0842c3e01608a72709af55cc5cb8b567efedf
Author: Albert Astals Cid [EMAIL PROTECTED]
Date:   Tue Sep 9 20:36:18 2008 +0200

API changed, so increase soname

diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 372d984..592a8b0 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -90,7 +90,7 @@ if (CAIRO_FOUND)
   )
 endif (CAIRO_FOUND)
 add_library(poppler-glib SHARED ${poppler_glib_SRCS})
-set_target_properties(poppler-glib PROPERTIES VERSION 3.0.0 SOVERSION 3)
+set_target_properties(poppler-glib PROPERTIES VERSION 4.0.0 SOVERSION 4)
 target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES})
 if (CAIRO_FOUND)
   target_link_libraries(poppler-glib ${CAIRO_LIBRARIES})
diff --git a/glib/Makefile.am b/glib/Makefile.am
index e84e40b..95f46ff 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -94,7 +94,7 @@ libpoppler_glib_la_LIBADD =   \
$(FONTCONFIG_LIBS)  \
$(cairo_libs)
 
-libpoppler_glib_la_LDFLAGS = -version-info 3:0:0
+libpoppler_glib_la_LDFLAGS = -version-info 4:0:0
 
 if BUILD_WITH_GDK
 noinst_PROGRAMS = test-poppler-glib
___
poppler mailing list
poppler@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/poppler