Merge lp://staging/~kiyoka/poppler-python/no-pygtk into lp://staging/poppler-python
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~kiyoka/poppler-python/no-pygtk |
| Merge into: | lp://staging/poppler-python |
| Diff against target: |
9909 lines (+77/-9467) 6 files modified
Makefile.am (+4/-7) aclocal.m4 (+0/-9328) configure.ac (+13/-19) poppler.defs (+32/-56) poppler.override (+26/-52) popplermodule.c (+2/-5) |
| To merge this branch: | bzr merge lp://staging/~kiyoka/poppler-python/no-pygtk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Poppler Python Bindings | Pending | ||
|
Review via email:
|
|||
Description of the change
I swapped out the reliance on pygtk to pygobject, since that now contains the codegen framework used. I updated the bindings to compile with >= 0.18 by removing the pixbuf functions that poppler's removed, and thus removing the dependence on gdk. This allows using poppler-python without needing gtk and x (such as in server environments). I also updated Page.get_text to reflect the api noted in the docs.
I also modified two minor things in configure.ac and Makefile.am to reflect more modern usage (no longer passing package name/version to AC_INIT_AUTOMAKE and using AM_CPPFLAGS instead of INCLUDES). It seems these have been in autotools for a while so I haven't bumped the required versions. The configure script also succeeded if pycairo was missing, which was an error so I fixed that as well.
Unmerged revisions
- 88. By Kevin Tardif
- 87. By Kevin Tardif
-
Added patch from alexandervdm with regards to bug #316722
- resolves resource leaks from poppler-python objects
- 86. By Kevin Tardif
-
Made configure exit if pycairo was missing
- pycairo isn't an optional requirement
- 85. By Kevin Tardif
-
Minor updates to configure.ac, Makefile.am
- swapped out AC_INIT_AUTOMAKE 2-arg form, docs say the 0-1 arg form has been
around since 1.11 or so
- swapped INCLUDES with AM_CPPFLAGS in Makefile.am, seems this has been around
for a while as well - 84. By Kevin Tardif
-
Removed dependence on pygtk, inow just relying on pyobject
- was just using pygtk for codegen (now part of pygobject), and the now removed
poppler-glib pixbuf functions - 83. By Kevin Tardif
-
Updated minimum popper version to 0.18
- 82. By Kevin Tardif
-
configure.ac now checks for pygoject codegen instead of pygtk
- 81. By Kevin Tardif
-
Fixed Page.get_text, added Page.get_
selected_ text, removed pixbuf functions - poppler 0.18 removed all pixbuf functions
- the api def for get_text matched that of get_selected_text, so fixed it - 80. By Kevin Tardif
-
Removed aclocal.m4 from repo
