diff options
Diffstat (limited to 'app-text/bibus')
-rw-r--r-- | app-text/bibus/Manifest | 10 | ||||
-rw-r--r-- | app-text/bibus/bibus-1.5.2-r2.ebuild | 86 | ||||
-rw-r--r-- | app-text/bibus/bibus-1.5.2-r3.ebuild | 86 | ||||
-rw-r--r-- | app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch | 31 | ||||
-rw-r--r-- | app-text/bibus/files/bibus-1.5.2-install.patch | 110 | ||||
-rw-r--r-- | app-text/bibus/files/bibus-1.5.2-wx30.patch | 158 | ||||
-rw-r--r-- | app-text/bibus/metadata.xml | 11 |
7 files changed, 492 insertions, 0 deletions
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest new file mode 100644 index 000000000000..b540dd31f9e3 --- /dev/null +++ b/app-text/bibus/Manifest @@ -0,0 +1,10 @@ +AUX bibus-1.5.2-bibus.cfg.patch 1280 SHA256 cdd318183769306cfc945951d8734b8370014945d520c3b8607eae0c442fb03b SHA512 f62aee3cd67d2c845cd3d19ee07ecab2a2a058d49c55232b7df51df3dde42bfba6a4f23cbc4d31f38788c9edf73780f444a4a5354b2deafac6a0f2d7158a2627 WHIRLPOOL fb05be4902ab8aedcf4e80a40c24d15270bed58ec6ab81e98b3660d264307012e1ada538287e08a137dc67e2974e1e8bcbdf2f6e4d35ec75cb4868cd25256c4b +AUX bibus-1.5.2-install.patch 5630 SHA256 33d29b68cc89d8023011aa15d544769c832ba280eca98478c68159d41778f72f SHA512 a553cd687d0bd861b65896acb2cface6f8950e3a6006975ae53108d5984ead2e9dde8e610e003b5c8888bd0b7e635542a83c1a502df09cb6a7dcb85b8a0a1e33 WHIRLPOOL 1d0ecbdf8ac74f8f9c1e27f3d6e11f5fe71b5436922c457621a49ef8088d6597fa796e3c9a9f7d7dc4b17eaf584c20014a58128ac8f1eef835678f1ea9c3da1c +AUX bibus-1.5.2-wx30.patch 7623 SHA256 37d21557bf4375b048df41cbdd346ffc08b57deb83dba2cffb55e1c141aff1a6 SHA512 48915b9dedbaddc6fc1f7adc6f197e1e5df01942a897c6aab664fa36c980a0978d111deb29e05d2b282f9ec17e01ff2117f11d86cd53600a0fa6ebfc4c6de049 WHIRLPOOL efb5b3a3f70639cd3538d337ab72215b2f6d3a02e7499ce7afba9bd74576fee3dc2da420b2926c168332493238828ea7540f6275d6127c916cf4773aa4c05b2e +DIST bibus-1.5.2-lo-4.patch.xz 13196 SHA256 b7147230929c304ab357c6a725c5cabbd577607e6200df968cdf2c057603c8a1 SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1 WHIRLPOOL d807d81277fac722c50d98575939142a6f1f5a1e9eb88dec0acf0053349f54ecce7d7dcf070742b143bbf166704994b401eeb1e1ecd3e32c351d9bc41c09d1d8 +DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38 +EBUILD bibus-1.5.2-r2.ebuild 2073 SHA256 d697f9e7200a2337d27def9544ed63e5851e69a9f78020b8ed0752de8e0c6076 SHA512 bb07320da8f9e63bb854010fad2e0096da1d4c8858b38ed04b15971cfdb5b103af233098f5d45dd1e9ef6831d070adf799b246626f04405c5f503302075ce0c9 WHIRLPOOL 2daef5c50ebb43c9a3b34bc687d398304b3bf2f685bd3724b65fcd2d763f0c9e219679c3bf1bc5f12311b808408f00926ad9ba7dab14327044aaecc7f38cbf04 +EBUILD bibus-1.5.2-r3.ebuild 2067 SHA256 9de71d7bd004abb59cf4bc303711ebe39786af052539aa07a5e6f9be39fd4f94 SHA512 c635061c82dc2c9496eda0c4bf587265cd54015eb070f93333a427bb8d2da8b12f98361431b9b37a6e552ed972069958e5b1f447807edbdc775b7061a75976b7 WHIRLPOOL 3066fc81f9c828244438d4ff7ed716555b50c85cf1b97b78092730c29b324581e1bbc639997b457bf1417d40b1d60037e5761387971b7492d610c85e9d0396a9 +MISC ChangeLog 3773 SHA256 b73db29405ae3406a30584ceed8334c0fe13e53b31a3e1476d5d0851261511f4 SHA512 97ffa22c04e16029a22d59c92024247cca7681ed768a9cd97146c65a61cfd8fb28b1c4aa382f6ccdc98da1bd34214fe571ddc68a9ab365277cadfcca6ccf461d WHIRLPOOL 00f1aad3c8946ed9d6847c76c4779c42b02c637e7dab626cde6f3ab0523844577f14315f7619734e4392b77c5c5bddfe3f8977d67df8e45f1b4a451abd12725a +MISC ChangeLog-2015 6768 SHA256 09751212cad7560fbec3888ddaaa6a9b2a12223cbaf0b02ed7043db36bd412fc SHA512 04fe6a2f805ffca73a117c55936c8a186765cdc60f5635a0e5bd2ff56a7bb269744e3e81ec15683dee0d6a0430e5ade042300fd9352f173d92e4c91223b365ec WHIRLPOOL c155f7cacb2c02f0e58e88497584043b01c9ca6b502e86ebc9642c34d55ad24610dda000e36ce66e8663718a2982fd8e78fe8d3997c59c2b8a6d1e8177fe1e03 +MISC metadata.xml 335 SHA256 cd07b450a91fad05d81c79343968a94d3d3419d5765979d6905ed6cd15d1434b SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f WHIRLPOOL 11ead0861679bc2f692c1ee669dc823501320590f9e1a509b7aa350f73c2966a94a0c57029bae06f00d569b4c17259c504f586425a43a53695e24172556eb443 diff --git a/app-text/bibus/bibus-1.5.2-r2.ebuild b/app-text/bibus/bibus-1.5.2-r2.ebuild new file mode 100644 index 000000000000..fa34f6e11d94 --- /dev/null +++ b/app-text/bibus/bibus-1.5.2-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit eutils fdo-mime multilib python-r1 versionator + +DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word" +HOMEPAGE="http://bibus-biblio.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz + " + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="mysql" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Most of this mess is designed to give the choice of sqlite or mysql +# but prefer sqlite. We also need to default to sqlite if neither is requested. +# Cannot depend on virtual/ooo +# bibus fails to start with app-office/openoffice-bin (bug #288232). +RDEPEND=" + ${PYTHON_DEPS} + app-office/libreoffice + dev-python/wxpython:2.8[${PYTHON_USEDEP}] + dev-db/sqliteodbc + dev-db/unixODBC + mysql? ( + dev-python/mysql-python[${PYTHON_USEDEP}] + dev-db/myodbc + )" +DEPEND="${RDEPEND}" + +pkg_setup() { + if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then + OFFICESUITE="/usr/$(get_libdir)/openoffice" + else + OFFICESUITE="/usr/$(get_libdir)/libreoffice" + fi +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-install.patch \ + "${FILESDIR}"/${P}-bibus.cfg.patch \ + "${WORKDIR}"/${P}-lo-4.patch +} + +src_compile() { :; } + +src_install() { + einfo "Installing for ${OFFICESUITE}" + installation() { + emake \ + DESTDIR="${D}" \ + prefix="${EPREFIX}/usr" \ + oopath="${OFFICESUITE}/program" \ + ooure="${OFFICESUITE}/ure-link/lib" \ + oobasis="${OFFICESUITE}/program" \ + sysconfdir="${EPREFIX}/etc" \ + pythondir="$(python_get_sitedir)" \ + python=${PYTHON} \ + install install-doc-en + } + python_foreach_impl installation + python_foreach_impl python_optimize + + python_foreach_impl python_newscript bibusStart.py ${PN} +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild new file mode 100644 index 000000000000..712ed76b6310 --- /dev/null +++ b/app-text/bibus/bibus-1.5.2-r3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit fdo-mime python-r1 versionator + +DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word" +HOMEPAGE="http://bibus-biblio.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz + https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz + " + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="mysql" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Most of this mess is designed to give the choice of sqlite or mysql +# but prefer sqlite. We also need to default to sqlite if neither is requested. +# Cannot depend on virtual/ooo +# bibus fails to start with app-office/openoffice-bin (bug #288232). +RDEPEND=" + ${PYTHON_DEPS} + app-office/libreoffice + dev-python/wxpython:3.0[${PYTHON_USEDEP}] + dev-db/sqliteodbc + dev-db/unixODBC + mysql? ( + dev-python/mysql-python[${PYTHON_USEDEP}] + dev-db/myodbc + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-install.patch + "${FILESDIR}"/${P}-bibus.cfg.patch + "${WORKDIR}"/${P}-lo-4.patch + "${FILESDIR}"/${P}-wx30.patch +) + +pkg_setup() { + if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then + OFFICESUITE="/usr/$(get_libdir)/openoffice" + else + OFFICESUITE="/usr/$(get_libdir)/libreoffice" + fi +} + +src_compile() { :; } + +src_install() { + einfo "Installing for ${OFFICESUITE}" + installation() { + emake \ + DESTDIR="${D}" \ + prefix="${EPREFIX}/usr" \ + oopath="${OFFICESUITE}/program" \ + ooure="${OFFICESUITE}/ure-link/lib" \ + oobasis="${OFFICESUITE}/program" \ + sysconfdir="${EPREFIX}/etc" \ + pythondir="$(python_get_sitedir)" \ + python=${PYTHON} \ + install install-doc-en + } + python_foreach_impl installation + python_foreach_impl python_optimize + + python_foreach_impl python_newscript bibusStart.py ${PN} +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} diff --git a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch new file mode 100644 index 000000000000..bfba0c0ac43b --- /dev/null +++ b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch @@ -0,0 +1,31 @@ + bibusStart.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/bibusStart.py b/bibusStart.py +index edfc19f..99c5381 100644 +--- a/bibusStart.py ++++ b/bibusStart.py +@@ -17,12 +17,14 @@ + # along with Bibus; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + # +-import ConfigParser,os,sys,urllib,urlparse ++import ConfigParser,os,sys,urllib,urlparse,site + cp=ConfigParser.ConfigParser() + fileName = sys.argv[0] + while os.path.islink(fileName): fileName = os.readlink(fileName) + sourcedir = os.path.abspath( os.path.dirname(fileName) ) +-cp.read( os.path.join(sourcedir,'bibus.cfg') ) ++bibus_sitedir = os.path.join(site.getsitepackages()[0], 'bibus') ++bibus_cfg = os.path.join(bibus_sitedir, 'bibus.cfg') ++cp.read(bibus_cfg) + # We read first, then if it is not null we convert to absolute path + # otherwise, empty path will be converted to the current directory path + python = cp.get('PATH','python') +@@ -69,5 +71,5 @@ else: + except KeyError: + os.environ[LIBPATH] = oopath + # starting Bibus +-os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(sourcedir,'bibus.py') +QUOTE ) ++os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(bibus_sitedir,'bibus.py') +QUOTE ) + diff --git a/app-text/bibus/files/bibus-1.5.2-install.patch b/app-text/bibus/files/bibus-1.5.2-install.patch new file mode 100644 index 000000000000..5225fcd6c3d8 --- /dev/null +++ b/app-text/bibus/files/bibus-1.5.2-install.patch @@ -0,0 +1,110 @@ + Makefile | 62 ++++++++++++++++++++++++-------------------------------------- + 1 files changed, 24 insertions(+), 38 deletions(-) + +diff --git a/Makefile b/Makefile +index d41b12d..b07cdff 100755 +--- a/Makefile ++++ b/Makefile +@@ -14,62 +14,60 @@ mandir = $(prefix)/share/man + man1dir = $(mandir)/man1 + + define install-files +- install -d $(datadir)/bibus +- install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/ ++ install -d $(DESTDIR)$(pythondir)/bibus ++ install -m644 *.py MySQL_Bibus.ini $(DESTDIR)/$(pythondir)/bibus/ + # + for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \ +- find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \ ++ find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(DESTDIR)/$(pythondir)/bibus/'{}' ';' ; \ + done +- install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg ++ install -m644 Setup/UnoConnectionListener.odg -D $(DESTDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg + # locale files. We look for all the directory in locale/ + for dir in $(wildcard locale/*); do \ + if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \ +- install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \ ++ install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(DESTDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \ + fi; \ + done + # bibus.config in /etc +- install -m644 bibus.config -D $(sysconfdir)/bibus.config ++ install -m644 bibus.config -D $(DESTDIR)/$(sysconfdir)/bibus.config + # man page +- install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1 ++ install -m644 Setup/bibus.1 -D $(DESTDIR)/$(man1dir)/bibus.1 + + # freedesktop icon and shortcut +- install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png +- install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop ++ install -m644 Pixmaps/bibus.png -D $(DESTDIR)$(datadir)/pixmaps/bibus.png ++ install -m644 Setup/bibus.desktop -D $(DESTDIR)/$(datadir)/applications/bibus.desktop + # The following lines are presumably not needed since icons/desktop are in standard locations + #echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop + #echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop + + # bibus command +- install -d $(bindir) +- ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus +- chmod 755 $(datadir)/bibus/bibusStart.py ++ install -d $(DESTDIR)/$(bindir) ++ ln -sf $(pythondir)/bibus/bibusStart.py $(DESTDIR)/$(bindir)/bibus ++ chmod 755 $(DESTDIR)$(pythondir)/bibus/bibusStart.py + + # basic doc files +- install -m755 -d $(datadir)/doc/bibus +- install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus ++ install -m755 -d $(DESTDIR)/$(datadir)/doc/${PF} ++ install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(DESTDIR)/$(datadir)/doc/${PF} + + # generating bibus.cfg file +- echo '[PATH]' > $(datadir)/bibus/bibus.cfg +- echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg +- echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg +- echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg +- echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg +- echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg +- echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg +- echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg +- echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg ++ echo '[PATH]' > $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'python = $(python)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'oopath = $(oopath)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'ooure = $(ooure)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'oobasis = $(oobasis)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'docdir = $(datadir)/doc/${PF}/html' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'localedir = $(datadir)/locale' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg ++ echo 'systemconf = $(sysconfdir)/bibus.config' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg + endef + + define install-doc-en + # copying docs in from Docs/html/en/ for bibus-doc-en + cd Docs;\ +- find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';' ++ find html/en/* -type f -exec install -m644 '{}' -D $(DESTDIR)/$(datadir)/doc/${PF}/'{}' ';' + endef + + define compile + # compile recursively all the python files located in $(datadir)/bibus +- $(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')" +- $(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')" ++ echo "No compilation" + endef + + install-files: +@@ -83,15 +81,3 @@ install: + $(install-doc-en) + $(compile) + +- # write uninstaller in $(datadir)/bibus/Setup/uninstall.sh +- echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh +- echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh +- echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh +- chmod 744 $(datadir)/bibus/Setup/uninstall.sh +- # end uninstaller diff --git a/app-text/bibus/files/bibus-1.5.2-wx30.patch b/app-text/bibus/files/bibus-1.5.2-wx30.patch new file mode 100644 index 000000000000..b53486741817 --- /dev/null +++ b/app-text/bibus/files/bibus-1.5.2-wx30.patch @@ -0,0 +1,158 @@ +Author: Jan Beyer <jan@beathovn.de> +Copyright: Copyright 2014 Jan Beyer +License: The same as the Bibus packaging. +Description: Patch to migrate bibus from wxpython2.8 to wxpython 3.0 + Thanks to Olly Betts for the script that did the main work: + http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git + +--- a/ShortcutEd.py ++++ b/ShortcutEd.py +@@ -27,7 +27,7 @@ + self.category = category # edited category + self.short = short # current shortcuts list + # begin wxGlade: Capture.__init__ +- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME ++ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER + wx.Dialog.__init__(self, *args, **kwds) + self.label_1 = wx.StaticText(self, -1, _("Capture from field")) + self.choice_field = wx.Choice(self, -1, choices=[]) +@@ -110,7 +110,7 @@ + self.parentshort = short # we keep a copy for updating it latter + self.db = db # connection to the database + # begin wxGlade: ShortcutEd.__init__ +- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME ++ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER + wx.Dialog.__init__(self, *args, **kwds) + self.list_shortcuts = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.LC_EDIT_LABELS|wx.LC_NO_HEADER|wx.LC_SINGLE_SEL|wx.SUNKEN_BORDER) + self.button_new = wx.Button(self, -1, _("New")) +--- a/bibus.py ++++ b/bibus.py +@@ -120,7 +120,7 @@ + # + class Bibus(wx.App): + def OnInit(self): +- wx.InitAllImageHandlers() ++ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers() + self.SetAppName(APPNAME) + # reading and eventually converting the config file + if os.path.isfile( wx.StandardPaths.Get().GetUserDataDir() ): # old config file in $HOME/.bibus +--- a/Pref_Shortcuts.py ++++ b/Pref_Shortcuts.py +@@ -26,7 +26,7 @@ + def __init__(self, categories, *args, **kwds): + self.categories = categories # current categories in parent. may be different from BIB.SHORTCUTS + # begin wxGlade: NewCategory.__init__ +- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME ++ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER + wx.Dialog.__init__(self, *args, **kwds) + self.label_1 = wx.StaticText(self, -1, _("Name")) + self.text_ctrl_name = wx.TextCtrl(self, -1, "") +@@ -80,7 +80,7 @@ + def onFile(self,evt): + tmpfilen = self.text_ctrl_name.GetValue() + if not tmpfilen: tmpfilen = 'shortcut' +- filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.SAVE ) ++ filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.FD_SAVE ) + if filen: + self.text_ctrl_filen.SetValue(filen) + +--- a/moveFile.py ++++ b/moveFile.py +@@ -96,7 +96,7 @@ + + if __name__ == "__main__": + app = wx.PySimpleApp(0) +- wx.InitAllImageHandlers() ++ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers() + dialog_1 = MoveFile(None, -1, "") + app.SetTopWindow(dialog_1) + dialog_1.Show() +--- a/OOo.py ++++ b/OOo.py +@@ -103,7 +103,7 @@ + self.saveDoc() + self.finalize() + except bibOOo_IOError: +- url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"), _("All files")),flags=wx.SAVE|wx.OVERWRITE_PROMPT) ++ url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"), _("All files")),flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT) + if url == '': + return + else: +--- a/BibFrame.py ++++ b/BibFrame.py +@@ -971,7 +971,7 @@ + + def __getFile(self,question=_("Please choose the file encoding"),mode='r',enc='ascii'): + """Get file and encoding. Return open file or None""" +- dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.OPEN | wx.CHANGE_DIR) ++ dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.FD_OPEN | wx.FD_CHANGE_DIR) + try: + answer = dlg.ShowModal() + filename = dlg.GetPath() +@@ -1048,7 +1048,7 @@ + # --------------------------------- File Export -------------------------------------------- + def __saveFile(self,question=_("Please choose the file encoding"),mode='r',enc='latin_1'): + """Get file and encoding. Return open file or None""" +- dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR) ++ dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR) + try: + answer = dlg.ShowModal() + filename = dlg.GetPath() +@@ -1124,7 +1124,7 @@ + + def __saveFileHTML(self,question=_("Choose the destination file"),mode='w'): + """Get file. Return open file or None""" +- dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR) ++ dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR) + try: + answer = dlg.ShowModal() + finally: +@@ -1176,7 +1176,7 @@ + ret = wx.GetSingleChoiceIndex(_('What do you want to export?'),_('Export'),[_('Selection'),_('Current key'),_('All')]) + if ret == -1: return + # get the file destination +- answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR ) ++ answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR ) + if answer == '': return + # we create the database + try: +@@ -1746,7 +1746,7 @@ + + arcstarttime=time.time() + archivename=time.strftime('bibusbackup_%y%m%d_%H%M%S.tar', time.localtime(arcstarttime)) +- dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR) ++ dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR) + dlg.SetDirectory(userDocsDir) + dlg.SetFilename(archivename) + dlg.SetWildcard("TAR archive (*.tar)|*.tar") +--- a/FirstStart/MySQL_Setup.py ++++ b/FirstStart/MySQL_Setup.py +@@ -533,7 +533,7 @@ + + if __name__ == "__main__": + app = wx.PySimpleApp(0) +- wx.InitAllImageHandlers() ++ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers() + MySQL_Setup = MySQL_Setup_Main(None, -1, "") + app.SetTopWindow(MySQL_Setup) + MySQL_Setup.Show() +--- a/StyleEditor/FormatEditor.py ++++ b/StyleEditor/FormatEditor.py +@@ -33,7 +33,7 @@ + + class FormatEditor(wx.Dialog): + def __init__(self, *args, **kwds): +- #kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.THICK_FRAME ++ #kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER + kwds["style"] = wx.DEFAULT_FRAME_STYLE + self.filename = kwds['filename'] + del kwds['filename'] +@@ -130,7 +130,7 @@ + wx.MessageBox(_("The style name is not correct, please avoid: '/' under linux; '\\' and ':' under Windows"),_("Style name"),style=wx.OK|wx.ICON_ERROR) + + # def SaveAs(self,evt): +-# self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.SAVE | wx.OVERWRITE_PROMPT) ++# self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) + # #print "%r"%self.filename + # if self.filename: + # self.Save(evt) diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml new file mode 100644 index 000000000000..114579753777 --- /dev/null +++ b/app-text/bibus/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">bibus-biblio</remote-id> + </upstream> +</pkgmetadata> |