diff options
Diffstat (limited to 'app-text/bibus')
-rw-r--r-- | app-text/bibus/Manifest | 7 | ||||
-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 |
6 files changed, 0 insertions, 403 deletions
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest deleted file mode 100644 index 5267e2561d07..000000000000 --- a/app-text/bibus/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX bibus-1.5.2-bibus.cfg.patch 1280 BLAKE2B 46d1d0f784636c02373372bab68bad592cf88a88f587a9c40411e38992ec58cbaef83ad3a1db4f3ba70701525312cdcda88e0041bd6bce59c899b868bfb76865 SHA512 f62aee3cd67d2c845cd3d19ee07ecab2a2a058d49c55232b7df51df3dde42bfba6a4f23cbc4d31f38788c9edf73780f444a4a5354b2deafac6a0f2d7158a2627 -AUX bibus-1.5.2-install.patch 5630 BLAKE2B 8f0da2eb8fcfde331b1008650f3ae0156a82f64e86fa894bcb051fc78322451a8cab3df2a19395791cfa3a09b4687669ecc0dd8521cbd342fa342d36ebeade76 SHA512 a553cd687d0bd861b65896acb2cface6f8950e3a6006975ae53108d5984ead2e9dde8e610e003b5c8888bd0b7e635542a83c1a502df09cb6a7dcb85b8a0a1e33 -AUX bibus-1.5.2-wx30.patch 7623 BLAKE2B 644d97804c8e43f63df0090026e0e757dc9a80eee521ac3f07630912619cb26ab9f9893351e56c7b1b1aa3024e3c15f71504392362404cf37d92b6c73182e2af SHA512 48915b9dedbaddc6fc1f7adc6f197e1e5df01942a897c6aab664fa36c980a0978d111deb29e05d2b282f9ec17e01ff2117f11d86cd53600a0fa6ebfc4c6de049 -DIST bibus-1.5.2-lo-4.patch.xz 13196 BLAKE2B 1dfef94699eee77537fea3d3b93aeb1613fc93b68df1deb43c4af6fae0bf5aeb2282bb823f4824272acdef53a5edcd9b30a52415e82da00952971fa65ec0d9dc SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1 -DIST bibus_1.5.2.orig.tar.gz 5411889 BLAKE2B db95ea4b1e0ba22fd85cb36d945864741a2f40890499018698c679c9f7d4b77b2299d2aa941664b2e4011c41ea62a31463b39c392eb3678633de17482f928474 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 -EBUILD bibus-1.5.2-r3.ebuild 2054 BLAKE2B 97ae9c2e3f09fe2e64f06a2518fa3f457c03bfec3e91b0f329626874abc3645b551a8ebe074173cb46e6f53254249792b2234303a02a82171424a8fe22021b2a SHA512 206cc042585499f922b1b50cb7d8bf8a34ac400e40da13e6de57c37e122c33360252ada918c6a3e1e011523788fd532439abe117aa3b496c8b51fb33932bea3e -MISC metadata.xml 335 BLAKE2B 1bf81d23e26f3990b58cf0ae16ffb46f7b70d5e9a632c1a787145bf143a30e6721f872f077716d8abbd7c572659329a6927524ee9b17276839e04421cbbd80f8 SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild deleted file mode 100644 index f046112d4e06..000000000000 --- a/app-text/bibus/bibus-1.5.2-r3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit python-r1 versionator xdg-utils - -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() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_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 deleted file mode 100644 index bfba0c0ac43b..000000000000 --- a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch +++ /dev/null @@ -1,31 +0,0 @@ - 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 deleted file mode 100644 index 5225fcd6c3d8..000000000000 --- a/app-text/bibus/files/bibus-1.5.2-install.patch +++ /dev/null @@ -1,110 +0,0 @@ - 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 deleted file mode 100644 index b53486741817..000000000000 --- a/app-text/bibus/files/bibus-1.5.2-wx30.patch +++ /dev/null @@ -1,158 +0,0 @@ -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 deleted file mode 100644 index 114579753777..000000000000 --- a/app-text/bibus/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?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> |