+++ /dev/null
-DIST passepartout-0.7.0.tar.bz2 369232 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b SHA512 41b8ed3905ee5332a89bc8512a5481bc52bdf58871254137e48150ad0d00a561aa9483d2accd41672f34bc37bea645f2a5ad40435cfd45490c3ff5542032ab8f WHIRLPOOL 2da483041be06eb2d8f268bd291d8105a0840c4e73ee61abb36fd4394310657e673979092b155718a8dc48c74b645529774e27a265f683daa73a8fa7752693ec
+++ /dev/null
-diff -NurdpB passepartout-0.6/src/pptout/document/group.h passepartout-0.6-patched/src/pptout/document/group.h
---- passepartout-0.6/src/pptout/document/group.h 2004-10-02 16:18:45.000000000 -0500
-+++ passepartout-0.6-patched/src/pptout/document/group.h 2007-03-21 19:00:13.000000000 -0500
-@@ -30,7 +30,7 @@ public:
- void set_flow_around(bool);
- bool get_flow_around() const;
- Boundary get_obstacle_boundary() const;
-- BoundaryVect Group::obstacle_list() const;
-+ BoundaryVect obstacle_list() const;
-
- void add(Pagent* obj);
- Pagent* ungroup(Pagent* obj);
-@@ -55,7 +55,7 @@ public:
- /** Raised on direct changes to the group (i.e. new / ungrouped member) */
- SigC::Signal1<void, Pagent*> group_changed_signal;
- private:
-- Boundary Group::get_untransformed_box() const;
-+ Boundary get_untransformed_box() const;
-
- ChildVec childs;
- };
-diff -NurdpB passepartout-0.6/src/pptout/propertiesdialog.h passepartout-0.6-patched/src/pptout/propertiesdialog.h
---- passepartout-0.6/src/pptout/propertiesdialog.h 2004-04-16 14:03:56.000000000 -0500
-+++ passepartout-0.6-patched/src/pptout/propertiesdialog.h 2007-03-21 19:18:26.000000000 -0500
-@@ -39,7 +39,7 @@ private:
- // no destructor
- ~PropertiesDialog();
-
-- void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index);
-+ void show_page_contents(GtkNotebookPage*, guint index);
-
- Gtk::Notebook book;
- std::vector<PropBase*> pages;
-diff -NurdpB passepartout-0.6/src/xml2ps/canvas.hh passepartout-0.6-patched/src/xml2ps/canvas.hh
---- passepartout-0.6/src/xml2ps/canvas.hh 2004-07-21 17:00:34.000000000 -0500
-+++ passepartout-0.6-patched/src/xml2ps/canvas.hh 2007-03-21 18:47:12.000000000 -0500
-@@ -52,7 +52,7 @@ namespace xml2ps {
- HBox hbox(bool span, float margin_left, float margin_right,
- float ascender, float descender);
-
-- virtual void xml2ps::Canvas::addRelObstacle
-+ virtual void addRelObstacle
- (const float left, const float bottom, const float right, const float top);
-
- // Check where the current column starts.
+++ /dev/null
-diff --git a/configure.ac b/configure.ac
-index e59f631..ca329c1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- # For automake < 1.6 you need to use this line instead:
- #AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE)
-
--AM_CONFIG_HEADER(src/defines.h)
-+AC_CONFIG_HEADERS([src/defines.h])
- # AC_CONFIG_HEADER(src/defines.h)
-
- # We're just a few binaries...not worth doing shared by default?
+++ /dev/null
-diff -urNad passepartout-0.7.0~/src/ps/misc.cc passepartout-0.7.0/src/ps/misc.cc
---- passepartout-0.7.0~/src/ps/misc.cc 2007-06-13 13:05:07.000000000 +0200
-+++ passepartout-0.7.0/src/ps/misc.cc 2007-09-14 17:49:49.000000000 +0200
-@@ -3,6 +3,8 @@
- ///
- #include "misc.h"
-
--std::ostream& PS::operator << (std::ostream& out, const PS::Concat& c) {
-- return out << '[' << c.matrix << "] concat\n";
-+namespace PS {
-+ std::ostream& operator << (std::ostream& out, const Concat& c) {
-+ return out << '[' << c.matrix << "] concat\n";
-+ }
- }
+++ /dev/null
---- a/src/fonts/afm.cc
-+++ b/src/fonts/afm.cc
-@@ -10,6 +10,8 @@
- #include "util/warning.h"
- #include "util/stringutil.h"
-
-+#include <limits>
-+
- using std::string;
-
- class font::AFMetrics::GlyphData {
---- a/src/fonts/fontmanager.cc
-+++ b/src/fonts/fontmanager.cc
-@@ -14,6 +14,8 @@
- #include "util/filesys.h"
- #include "util/warning.h"
-
-+#include <memory>
-+
- font::FontManager* font::FontManager::_instance = 0;
- // StaticMutex can, unlike regular Mutex, be created before the call
- // to thread_init
---- a/src/pptout/document/rasterframe.cc
-+++ b/src/pptout/document/rasterframe.cc
-@@ -12,6 +12,8 @@
- #include "ps/misc.h"
- #include "pptout/config.h" // Todo
-
-+#include <ctime>
-+
- RasterFrame::RasterFrame(const ElementWrap& xml, Group *parent)
- : BasicFrame(xml, parent),
- association(xml.get_filename("file")),
---- a/src/ps/encode.h
-+++ b/src/ps/encode.h
-@@ -8,6 +8,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstring>
-
- // Standard PostScript encoding filters
-
---- a/src/ps/examinepdf.cc
-+++ b/src/ps/examinepdf.cc
-@@ -5,6 +5,7 @@
- #include <fstream>
- #include <cassert> // Todo: other assert!
- #include <iostream>
-+#include <cstdlib>
-
- void usage() {}
-
---- a/src/ps/pdf.cc
-+++ b/src/ps/pdf.cc
-@@ -15,6 +15,7 @@
- #include <stdexcept>
- #include <glibmm/convert.h>
- #include <fstream>
-+#include <typeinfo>
-
-
- namespace {
---- a/src/util/filesys.cc
-+++ b/src/util/filesys.cc
-@@ -14,6 +14,9 @@
- #include <sys/types.h>
- #endif
-
-+#include <cstring>
-+#include <stdlib.h>
-+
- using std::string;
-
- ClibException::ClibException(const string& msg)
---- a/src/util/vector.h
-+++ b/src/util/vector.h
-@@ -5,6 +5,7 @@
- ///
- #include <algorithm> // max
- #include <cmath> // sqrt
-+#include <ostream>
- template<class C> C sqr(const C& c) { return c*c; }
-
- template <class C>
---- a/src/util/tempfile.cc
-+++ b/src/util/tempfile.cc
-@@ -8,6 +8,9 @@
- #include <stdexcept>
- #include <unistd.h>
-
-+#include <cstring>
-+#include <stdlib.h>
-+
- namespace {
- std::string get_tmplate(std::string base) {
- base += "XXXXXX";
+++ /dev/null
-From tbm@cyrius.com Sat Nov 08 17:07:16 2008
-Received: (at submit) by bugs.debian.org; 8 Nov 2008 17:07:16 +0000
-X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
- (2007-08-08) on rietz.debian.org
-X-Spam-Level:
-X-Spam-Bayes: score:0.0000 Tokens: new, 59; hammy, 151; neutral, 105; spammy,
- 0. spammytokens: hammytokens:0.000-+--libxml2, 0.000-+--amd64,
- 0.000-+--sk:libgnom, 0.000-+--Usertags, 0.000-+--H*r:1000
-X-Spam-Status: No, scoreø.8 required0 testsL,BAYES_00,HAS_PACKAGE,
- MURPHY_DRUGS_REL8,WEIRD_PORT autolearnúm
- version2.3-bugs.debian.org_2005_01_02
-Return-path: <tbm@cyrius.com>
-Received: from sorrow.cyrius.com ([65.19.161.204])
- by rietz.debian.org with esmtp (Exim 4.63)
- (envelope-from <tbm@cyrius.com>)
- id 1KyrHH-0002u6-Vy
- for submit@bugs.debian.org; Sat, 08 Nov 2008 17:07:16 +0000
-Received: by sorrow.cyrius.com (Postfix, from userid 10)
- id 564C8D857; Sat, 8 Nov 2008 17:07:15 +0000 (UTC)
-Received: by deprecation.cyrius.com (Postfix, from userid 1000)
- id 0F2C1150B58; Sat, 8 Nov 2008 18:06:54 +0100 (CET)
-Date: Sat, 8 Nov 2008 18:06:53 +0100
-From: Martin Michlmayr <tbm@cyrius.com>
-To: submit@bugs.debian.org
-Subject: FTBFS with GCC 4.4: missing #include
-Message-ID: <20081108170653.GD27323@deprecation.cyrius.com>
-References: <20081108132249.5332A460DB@em64t.snowman.net>
-MIME-Version: 1.0
-Content-Type: text/plain; charset-ascii
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-In-Reply-To: <20081108132249.5332A460DB@em64t.snowman.net>
-User-Agent: Mutt/1.5.18 (2008-05-17)
-Delivered-To: submit@bugs.debian.org
-
-Package: passepartout
-Version: 0.7.0-1.1
-User: debian-gcc@lists.debian.org
-Usertags: ftbfs-gcc-4.4
-Tags: patch
-
-Your package fails to build with the upcoming GCC 4.4. Version 4.4
-has not been released yet but I'm building with a snapshot in order
-to find errors and give people an advance warning.
-
-GCC 4.4 cleaned up some more C++ headers. You always have to #include
-headers directly and cannot rely for things to be included indirectly.
-
-You can reproduce this problem with gcc-snapshot from unstable.
-
-> Automatic build of passepartout_0.7.0-1.1 on em64t by sbuild/amd64 0.53
-...
-> if x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../src -I/usr/include/libxml++-1.0 -I/usr/lib/libxml++-1.0/include -I/usr/include/libxml2 -D_REENTRANT -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -D_REENTRANT -I/usr/include/libgnomecanvasmm-2.6 -I/usr/lib/libgnomecanvasmm-2.6/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/libgnomecanvas-2.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -MT stringutil.o -MD -MP -MF ".deps/stringutil.Tpo" -c -o stringutil.o stringutil.cc; \
-> then mv -f ".deps/stringutil.Tpo" ".deps/stringutil.Po"; else rm -f ".deps/stringutil.Tpo"; exit 1; fi
-> In file included from stringutil.cc:4:
-> stringutil.h: In function 'C to(const std::string&)':
-> stringutil.h:25: error: 'EOF' was not declared in this scope
-> stringutil.cc: In function 'std::string to_roman(int)':
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
-> make[4]: *** [stringutil.o] Error 1
-> make[4]: Leaving directory `/build/tbm/passepartout-0.7.0/src/util'
-
---- src/util/stringutil.h~ 2008-11-08 16:48:10.000000000 +0000
-+++ src/util/stringutil.h 2008-11-08 16:48:25.000000000 +0000
-@@ -4,6 +4,7 @@
- // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
- ///
- #include "typeinfo.h"
-+#include <cstdio>
- #include <string>
- #include <sstream>
- #include <stdexcept>
---- src/util/warning.cc~ 2008-11-08 16:48:33.000000000 +0000
-+++ src/util/warning.cc 2008-11-08 16:48:43.000000000 +0000
-@@ -2,6 +2,7 @@
- // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
- ///
- #include "warning.h"
-+#include <cstdio>
-
- class NullFdBuf : public std::streambuf {
- public:
---- src/util/filedescriptors.cc~ 2008-11-08 16:49:15.000000000 +0000
-+++ src/util/filedescriptors.cc 2008-11-08 16:49:23.000000000 +0000
-@@ -5,6 +5,7 @@
- #include "filesys.h"
- #include <fcntl.h>
- #include <unistd.h>
-+#include <cstdio>
-
- int
- filedesc::move(int to, int from) {
-
---
-Martin Michlmayr
-http://www.cyrius.com/
-
-
-
-
+++ /dev/null
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/fonts/Makefile.am passepartout-0.7.0/src/fonts/Makefile.am
---- passepartout-0.7.0.orig/src/fonts/Makefile.am 2007-06-13 07:05:06.000000000 -0400
-+++ passepartout-0.7.0/src/fonts/Makefile.am 2007-08-07 19:11:04.000000000 -0400
-@@ -5,9 +5,9 @@
-
- libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
-
--libfonts_a_CXXFLAGS = -I$(top_srcdir)/src
-+libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
-
- # for Glib::ustring
--libfonts_a_CXXFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-
- #libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
-\ No newline at end of file
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/Makefile.am passepartout-0.7.0/src/pptout/Makefile.am
---- passepartout-0.7.0.orig/src/pptout/Makefile.am 2007-07-26 07:31:05.000000000 -0400
-+++ passepartout-0.7.0/src/pptout/Makefile.am 2007-08-07 19:14:51.000000000 -0400
-@@ -32,10 +32,10 @@
- $(BUILT_SOURCES) \
- $(NULL)
-
--passepartout_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
-- $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
-+passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
-
--passepartout_CXXFLAGS += -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
-+passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
-+ $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
-
- passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
- $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/document/Makefile.am passepartout-0.7.0/src/pptout/document/Makefile.am
---- passepartout-0.7.0.orig/src/pptout/document/Makefile.am 2007-06-13 07:05:06.000000000 -0400
-+++ passepartout-0.7.0/src/pptout/document/Makefile.am 2007-08-07 19:15:12.000000000 -0400
-@@ -10,6 +10,6 @@
- textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc \
- loader.cc typesetterthread.cc
-
--libdocument_a_CXXFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-+libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
-
--libdocument_a_CXXFLAGS += -I$(top_srcdir)/src
-+libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/widget/Makefile.am passepartout-0.7.0/src/pptout/widget/Makefile.am
---- passepartout-0.7.0.orig/src/pptout/widget/Makefile.am 2007-06-14 06:17:20.000000000 -0400
-+++ passepartout-0.7.0/src/pptout/widget/Makefile.am 2007-08-07 19:29:32.000000000 -0400
-@@ -8,6 +8,6 @@
- dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc \
- usererror.cc programs.cc zoomer.cc
-
--libwidget_a_CXXFLAGS = $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-+libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
-
--libwidget_a_CXXFLAGS += -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
-+libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/ps/Makefile.am passepartout-0.7.0/src/ps/Makefile.am
---- passepartout-0.7.0.orig/src/ps/Makefile.am 2007-06-13 07:48:09.000000000 -0400
-+++ passepartout-0.7.0/src/ps/Makefile.am 2007-08-07 19:26:30.000000000 -0400
-@@ -9,12 +9,12 @@
-
- examinepdf_SOURCES = examinepdf.cc
-
--# for Glib::ustring
--libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libps_a_CPPFLAGS = -I$(top_srcdir)/src
-
--libps_a_CXXFLAGS += -I$(top_srcdir)/src
-+# for Glib::ustring
-+libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-
--examinepdf_CXXFLAGS = $(libps_a_CXXFLAGS)
-+examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
- examinepdf_LDADD = $(GTKMM_LIBS) \
- -L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
- examinepdf_DEPENDENCIES = libps.a
-@@ -24,8 +24,8 @@
- TESTS = runtest
- check_PROGRAMS = runtest
- runtest_SOURCES = test_glyphlist.cc
--runtest_CXXFLAGS = -I$(top_srcdir)/src
--runtest_CXXFLAGS += $(GTKMM_CFLAGS)
-+runtest_CPPFLAGS = -I$(top_srcdir)/src
-+runtest_CPPFLAGS += $(GTKMM_CFLAGS)
- runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
- runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
- $(GTKMM_LIBS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/testbed/Makefile.am passepartout-0.7.0/src/testbed/Makefile.am
---- passepartout-0.7.0.orig/src/testbed/Makefile.am 2007-06-13 07:05:07.000000000 -0400
-+++ passepartout-0.7.0/src/testbed/Makefile.am 2007-08-07 19:17:57.000000000 -0400
-@@ -4,8 +4,8 @@
-
- libppttest_a_SOURCES = testbed.cc
-
--libppttest_a_CXXFLAGS = -I$(top_srcdir)/src
-+libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
-
- # Just because Glib::Exception is stupid and doesn't inherit the standard
- # exception the testbed has to know about glib!
--libppttest_a_CXXFLAGS += $(GTKMM_CFLAGS)
-+libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/util/Makefile.am passepartout-0.7.0/src/util/Makefile.am
---- passepartout-0.7.0.orig/src/util/Makefile.am 2007-06-14 06:12:42.000000000 -0400
-+++ passepartout-0.7.0/src/util/Makefile.am 2007-08-07 19:18:50.000000000 -0400
-@@ -12,12 +12,12 @@
- cmdline.cc xmlwrap.cc
-
- # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
--CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-+AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-
- TESTS = runtest
- check_PROGRAMS = runtest
- runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
- test_boundary.cc test_procio.cc test_cmdline.cc
--runtest_CXXFLAGS = -I$(top_srcdir)/src
-+runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
- runtest_DEPENDENCIES = $(noinst_LIBRARIES)
- runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-diff -Nurd -x'*~' passepartout-0.7.0.orig/src/xml2ps/Makefile.am passepartout-0.7.0/src/xml2ps/Makefile.am
---- passepartout-0.7.0.orig/src/xml2ps/Makefile.am 2007-06-22 12:07:26.000000000 -0400
-+++ passepartout-0.7.0/src/xml2ps/Makefile.am 2007-08-07 19:36:26.000000000 -0400
-@@ -13,12 +13,12 @@
-
- xml2ps_SOURCES = main.cc
-
--libxml2ps_a_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
-- $(GNOMECANVAS_CFLAGS)
-+libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
-
--libxml2ps_a_CXXFLAGS += -I$(top_srcdir)/src
-+libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
-+ $(GNOMECANVAS_CFLAGS)
-
--xml2ps_CXXFLAGS = $(libxml2ps_a_CXXFLAGS)
-+xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
-
- xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
- libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a
+++ /dev/null
-Index: trunk/src/ps/Makefile.am
-===================================================================
---- trunk/src/ps/Makefile.am (revision 1530)
-+++ trunk/src/ps/Makefile.am (working copy)
-@@ -1,31 +1,26 @@
- bin_PROGRAMS = examinepdf
--noinst_LIBRARIES = libps.a
-+noinst_LTLIBRARIES = libps.la
-
- dist_noinst_HEADERS = encode.h pdf.h unicode.h pfb2pfa.h misc.h wineps.h \
- pdfparser.h type42.h
-
--libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
-+libps_la_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
- wineps.cc pdfparser.cc type42.cc
-
- examinepdf_SOURCES = examinepdf.cc
-
--libps_a_CPPFLAGS = -I$(top_srcdir)/src
-+libps_la_LIBADD = ../fonts/libfonts.la
-
- # for Glib::ustring
--libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libps_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
-+libps_la_LIBADD += $(GTKMM_LIBS)
-
--examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
--examinepdf_LDADD = $(GTKMM_LIBS) \
-- -L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
--examinepdf_DEPENDENCIES = libps.a
-+examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS)
-+examinepdf_LDADD = libps.la
-
--#libps_a_LIBADD = $(GTKMM_LIBS)
--
- TESTS = runtest
- check_PROGRAMS = runtest
- runtest_SOURCES = test_glyphlist.cc
--runtest_CPPFLAGS = -I$(top_srcdir)/src
--runtest_CPPFLAGS += $(GTKMM_CFLAGS)
--runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
--runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
-+runtest_CPPFLAGS = $(GTKMM_CFLAGS)
-+runtest_LDADD = ../testbed/libppttest.la libps.la ../util/libpptutil.la \
- $(GTKMM_LIBS)
-Index: trunk/src/xml2ps/Makefile.am
-===================================================================
---- trunk/src/xml2ps/Makefile.am (revision 1530)
-+++ trunk/src/xml2ps/Makefile.am (working copy)
-@@ -1,28 +1,29 @@
- bin_PROGRAMS = xml2ps
-
--noinst_LIBRARIES = libxml2ps.a
-+noinst_LTLIBRARIES = libxml2ps.la
-
- dist_noinst_HEADERS = blockcontainer.hh boundaries.hh canvas.hh \
- line.hh paragraph.hh typesetter.hh pagedstream.hh \
- pdfcanvas.hh pscanvas.hh psstream.hh xly.hh xcanvas.hh
-
--libxml2ps_a_SOURCES = paragraph.cc xly.cc typesetter.cc \
-+libxml2ps_la_SOURCES = paragraph.cc xly.cc typesetter.cc \
- blockcontainer.cc psstream.cc line.cc canvas.cc \
- pagedstream.cc pscanvas.cc boundaries.cc pdfcanvas.cc \
- xcanvas.cc
-
- xml2ps_SOURCES = main.cc
-
--libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
--
--libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
-+libxml2ps_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) \
- $(GNOMECANVAS_CFLAGS)
-
--xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
-+libxml2ps_la_LIBADD =../util/libpptutil.la ../fonts/libfonts.la ../ps/libps.la \
-+ $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-
--xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
-- libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a
-+xml2ps_CPPFLAGS = $(libxml2ps_la_CPPFLAGS)
-
-+xml2ps_LDADD = libxml2ps.la \
-+ $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-+
- #install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)
- dist_xml_DATA = xml2ps.dtd xhtml.xslt docbook.xslt
-
-Index: trunk/src/fonts/Makefile.am
-===================================================================
---- trunk/src/fonts/Makefile.am (revision 1530)
-+++ trunk/src/fonts/Makefile.am (working copy)
-@@ -1,13 +1,15 @@
--noinst_LIBRARIES = libfonts.a
-+noinst_LTLIBRARIES = libfonts.la
-
- dist_noinst_HEADERS = fontinfo.hh fontmanager.hh fontmetrics.hh afm.hh \
- freetype.hh
-
--libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
-+libfonts_la_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
-
--libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
--
- # for Glib::ustring
--libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
-+libfonts_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
-
--#libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
-\ No newline at end of file
-+libfonts_la_LIBADD = ../util/libpptutil.la $(FREETYPE_LIBS) $(GTKMM_LIBS)
-+
-+# can't have explicit circular dependency, so rely on consumers
-+# to link against them and us
-+#libfonts_la_LIBADD += ../ps/libps.la
-Index: trunk/src/Makefile.am
-===================================================================
---- trunk/src/Makefile.am (revision 1530)
-+++ trunk/src/Makefile.am (working copy)
-@@ -1 +1 @@
--SUBDIRS = testbed util fonts ps xml2ps pptout
-+SUBDIRS = util testbed fonts ps xml2ps pptout
-Index: trunk/src/testbed/Makefile.am
-===================================================================
---- trunk/src/testbed/Makefile.am (revision 1530)
-+++ trunk/src/testbed/Makefile.am (working copy)
-@@ -1,11 +1,18 @@
--noinst_LIBRARIES = libppttest.a
-+noinst_LTLIBRARIES = libppttest.la
-
- dist_noinst_HEADERS = testbed.hh
-
--libppttest_a_SOURCES = testbed.cc
-+libppttest_la_SOURCES = testbed.cc
-
--libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
--
- # Just because Glib::Exception is stupid and doesn't inherit the standard
- # exception the testbed has to know about glib!
--libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
-+libppttest_la_CPPFLAGS = $(GTKMM_CFLAGS)
-+
-+libppttest_la_LIBADD = ../util/libpptutil.la $(GTKMM_LIBS)
-+
-+TESTS = runtest
-+check_PROGRAMS = runtest
-+runtest_SOURCES = ../util/test_stringutil.cc ../util/test_valuunit.cc ../util/test_matrix.cc \
-+ ../util/test_boundary.cc ../util/test_procio.cc ../util/test_cmdline.cc
-+runtest_CPPFLAGS = $(GTKMM_CFLAGS)
-+runtest_LDADD = libppttest.la ../util/libpptutil.la $(GTKMM_LIBS)
-Index: trunk/src/pptout/widget/Makefile.am
-===================================================================
---- trunk/src/pptout/widget/Makefile.am (revision 1530)
-+++ trunk/src/pptout/widget/Makefile.am (working copy)
-@@ -1,13 +1,13 @@
--noinst_LIBRARIES = libwidget.a
-+noinst_LTLIBRARIES = libwidget.la
-
- dist_noinst_HEADERS = spinner.h filesel.h imagefilesel.h dialogwrap.h \
- subpanel.h wmisc.h errordialog.h usererror.h programs.h \
- zoomer.h
-
--libwidget_a_SOURCES = spinner.cc filesel.cc imagefilesel.cc \
-+libwidget_la_SOURCES = spinner.cc filesel.cc imagefilesel.cc \
- dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc \
- usererror.cc programs.cc zoomer.cc
-
--libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
--
--libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-+libwidget_la_CPPFLAGS = -DDOCDIR=\"$(docdir)\"
-+libwidget_la_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
-+libwidget_la_LIBADD = ../../util/libpptutil.la $(GTKMM_LDFLAGS) $(GNOMEVFS_LDFLAGS) $(GNOME_LDFLAGS)
-Index: trunk/src/pptout/document/Makefile.am
-===================================================================
---- trunk/src/pptout/document/Makefile.am (revision 1530)
-+++ trunk/src/pptout/document/Makefile.am (working copy)
-@@ -1,15 +1,18 @@
--noinst_LIBRARIES = libdocument.a
-+noinst_LTLIBRARIES = libdocument.la
-
- dist_noinst_HEADERS = basicframe.h cachedframe.h document.h group.h \
- imageframe.h page.h pagent.h rasterframe.h textframe.h \
- textstream.h fileerrors.h paper_sizes.h getxsltparams.h \
- loader.h filecontext.h typesetterthread.h
-
--libdocument_a_SOURCES = basicframe.cc cachedframe.cc document.cc \
-+libdocument_la_SOURCES = basicframe.cc cachedframe.cc document.cc \
- group.cc imageframe.cc page.cc pagent.cc rasterframe.cc \
- textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc \
- loader.cc typesetterthread.cc
-
--libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
-+libdocument_la_CPPFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-
--libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
-+# can't get complete symbol resolution here...rasterframe.cc uses
-+# config() from ../passepartout-config.o but subdirs build before
-+# parent so cannot easily get it
-+libdocument_la_LIBADD = ../../util/libpptutil.la ../../ps/libps.la ../../xml2ps/libxml2ps.la ../widget/libwidget.la $(GTKMM_LIBS) $(XMLPP_LIBS)
-Index: trunk/src/pptout/Makefile.am
-===================================================================
---- trunk/src/pptout/Makefile.am (revision 1530)
-+++ trunk/src/pptout/Makefile.am (working copy)
-@@ -1,4 +1,4 @@
--SUBDIRS = document widget icons
-+SUBDIRS = widget document icons
-
- EXTRA_DIST = NOTES
-
-@@ -32,19 +32,19 @@
- $(BUILT_SOURCES) \
- $(NULL)
-
--passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
-+passepartout_CPPFLAGS = -DXMLPATH=\"$(xmldir)\"
-
- passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
- $(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
-
--passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
-- $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
-+pptpartlibs= document/libdocument.la ../xml2ps/libxml2ps.la \
-+ ../fonts/libfonts.la ../ps/libps.la \
-+ ../util/libpptutil.la widget/libwidget.la
-
--pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a \
-- ../fonts/libfonts.a ../ps/libps.a \
-- ../util/libpptutil.a widget/libwidget.a
-+passepartout_LDADD = $(pptpartlibs)
-
--passepartout_LDADD += $(pptpartlibs)
-+passepartout_LDADD += $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
-+ $(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
-
- # Extra dependencies for builddate, so it is rebuilt every time anything else
- # is rebuilt
-Index: trunk/src/util/Makefile.am
-===================================================================
---- trunk/src/util/Makefile.am (revision 1530)
-+++ trunk/src/util/Makefile.am (working copy)
-@@ -1,23 +1,17 @@
--noinst_LIBRARIES = libpptutil.a
-+noinst_LTLIBRARIES = libpptutil.la
-
- dist_noinst_HEADERS = stringutil.h filesys.h warning.h os.h configfile.h \
- valueunit.h units.h refcount.h matrix.h boundary.h \
- rectboundary.h typeinfo.h barrier.h processman.h tempfile.h \
- filewatcher.h vector.h filedescriptors.h cmdline.h xmlwrap.h
-
--libpptutil_a_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
-+libpptutil_la_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
- configfile.cc \
- matrix.cc boundary.cc rectboundary.cc typeinfo.cc barrier.cc \
- processman.cc tempfile.cc filewatcher.cc filedescriptors.cc \
- cmdline.cc xmlwrap.cc
-
- # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
--AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-+libpptutil_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
-
--TESTS = runtest
--check_PROGRAMS = runtest
--runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
-- test_boundary.cc test_procio.cc test_cmdline.cc
--runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
--runtest_DEPENDENCIES = $(noinst_LIBRARIES)
--runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-+libpptutil_la_LIBADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
-Index: trunk/configure.ac
-===================================================================
---- trunk/configure.ac (revision 1530)
-+++ trunk/configure.ac (working copy)
-@@ -9,14 +9,16 @@
- AM_CONFIG_HEADER(src/defines.h)
- # AC_CONFIG_HEADER(src/defines.h)
-
--# Define global compiler flags:
--MY_CXXFLAGS="-Wall"
--CXXFLAGS="$CXXFLAGS $MY_CXXFLAGS"
-+# We're just a few binaries...not worth doing shared by default?
-+AC_DISABLE_SHARED
-
- # Checks for programs.
- AC_PROG_CXX
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
-
-+# Define global compiler flags:
-+CXXFLAGS="$CXXFLAGS -Wall"
-+
- # AC_APPLY_RPATH(LIBS)
- # --------------------
- # Add an -rpath linker option for each -L path in LIBS
+++ /dev/null
---- trunk/configure.ac 2007/08/08 17:47:27 1527
-+++ trunk/configure.ac 2007/08/09 14:55:36 1529
-@@ -30,7 +30,7 @@
- # check for libxml++
- AC_SUBST([XMLPP_LIBS])
- AC_SUBST([XMLPP_CFLAGS])
--PKG_CHECK_MODULES([XMLPP], libxml++-1.0 >= 1.0)
-+PKG_CHECK_MODULES([XMLPP], libxml++-2.6 >= 1.0)
- AC_APPLY_RPATH([XMLPP_LIBS])
-
- AC_SUBST([GTKMM_LIBS])
+++ /dev/null
-Index: src/pptout/postscriptviewent.cc
-===================================================================
---- src/pptout/postscriptviewent.cc (revision 1517)
-+++ src/pptout/postscriptviewent.cc (arbetskopia)
-@@ -143,7 +143,7 @@
-
- std::ostringstream tmp;
- tmp << psinterpreter //assuming it is ghostscript
-- << " -q -dSAFER -dNOPAUSE -dBATCH"
-+ << " -q -dSAFE -dNOPAUSE -dBATCH"
- << " -sDEVICE=" << preferredDeviceName();
-
- // gs doesn't use fontconfig, so give font paths as parameters
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools base eutils gnome2 libtool
-
-DESCRIPTION="A DTP application for the X Window System"
-HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
-SRC_URI="mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2"
-
-IUSE="gnome"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPS="dev-cpp/libxmlpp:2.6
- >=dev-libs/libxml2-2
- dev-cpp/gtkmm:2.4
- dev-cpp/libgnomecanvasmm:2.6
- dev-libs/glib:2
- dev-libs/libsigc++:2
- media-libs/freetype:2
- virtual/fam
- gnome? (
- gnome-base/libgnome
- gnome-base/gnome-vfs
- )
- "
-
-RDEPEND="${COMMON_DEPS}
- dev-libs/libxslt
- app-text/ghostscript-gpl"
-
-DEPEND="${COMMON_DEPS}
- virtual/pkgconfig"
-
-DOCS="AUTHORS BUGS NEWS README"
-
-# GCC-4.2 patch:
-# https://bugzilla.gnome.org/477017
-# GCC-4.3 patch:
-# Snatched from Debian
-# https://bugzilla.gnome.org/565131
-# include-flags:
-# https://bugzilla.gnome.org/464517
-# libtoolization:
-# https://bugzilla.gnome.org/464567
-# libxml-2.6:
-# https://bugzilla.gnome.org/449596
-
-# The include and libtoolization patches are needed for
-# forced as-needed to work.
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc42.patch"
- "${FILESDIR}/${P}-gcc43.patch"
- "${FILESDIR}/${P}-gcc44.patch"
- "${FILESDIR}/${P}-include-flags.patch"
- "${FILESDIR}/${P}-libtoolization.patch"
- "${FILESDIR}/${P}-safer.patch"
- "${FILESDIR}/${P}-libxmlpp-2.6-depend.patch"
- "${FILESDIR}/${P}-automake-1.13.patch"
- )
-
-src_unpack() {
- base_src_unpack
-}
-
-src_prepare() {
- gnome2_omf_fix
- base_src_prepare
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- # Bug 367867: Broken AC_ARG_WITH
- use gnome && G2CONF="--with-gnome"
- gnome2_src_configure
-}
-
-src_compile() {
- base_src_compile
-}
-
-src_install() {
- gnome2_src_install
- mv "${D}"/usr/share/doc/${PN}/* "${D}/usr/share/doc/${PF}" || die
- rmdir "${D}"/usr/share/doc/${PN}/ || die
- make_desktop_entry "/usr/bin/passepartout" "Passepartout DTP" "" "GNOME;Graphics"
-}
+++ /dev/null
-DIST GtkAda-gpl-2.10.0.tgz 5519438 SHA256 f5a1a4efecaf99ce7cdaecfa4df7b6935be03692c9b68d8c746a58cca1137a30 SHA512 5162a5c75d5bf9e6f7f6d5f9b54680d7b4fb1265010630d96e9054b9d1993b8f06c63533f6fdbdc6f7b2137c3d88fb7fec06d0ca1460014e701a2469b280d173 WHIRLPOOL 4454e4824b036f6e5072b5d6b042213bbca5ffd27e4c7a6e903f41e0806bc8b232b439fc7480c533c10bab0ac65c40513364c4f266c8f367eda5cdcd76bcefe8
+++ /dev/null
-diff -ru GtkAda-2.4.0-orig/src/gtkada-mdi.adb GtkAda-2.4.0/src/gtkada-mdi.adb
---- GtkAda-2.4.0-orig/src/gtkada-mdi.adb 2004-11-09 09:35:57.000000000 +0100
-+++ GtkAda-2.4.0/src/gtkada-mdi.adb 2006-05-18 23:15:13.917488750 +0200
-@@ -4778,6 +4778,7 @@
- when Top | Bottom =>
- Widths (Side) := 0;
- Heights (Side) := Get_Allocation_Height (MDI.Docks (Side));
-+ when None => Null;
- end case;
-
- -- If not allocated yet
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils gnat versionator
-
-Name="GtkAda-gpl"
-MajorPV=$(get_version_component_range 1-2)
-DESCRIPTION="Gtk+ bindings to the Ada language"
-HOMEPAGE="https://libre.adacore.com/GtkAda/"
-SRC_URI="mirror://gentoo/${Name}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="nls opengl"
-
-DEPEND="virtual/ada
- >=x11-libs/cairo-1.2.6
- >=dev-libs/glib-2.12.4
- >=x11-libs/pango-1.14.9
- >=dev-libs/atk-1.12.1
- >=x11-libs/gtk+-2.10.9
- >=sys-apps/sed-4"
-RDEPEND=""
-
-S="${WORKDIR}/${Name}-${PV}"
-
-# only needed for gcc-3.x based gnat profiles, but matching them individually
-# would be insane
-QA_EXECSTACK="${AdalibLibTop:1}/*/gtkada/libgtkada-${MajorPV}.so.0"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- sed -i -e "s:-aI\$prefix/include/gtkada:-aI${AdalibSpecsDir}/gtkada:" \
- src/tools/gtkada-config.in
-
- # disable building tests to avoid waisting time while building for every
- # profile. The tests are nonetheless installed under doc dir.
- sed -i -e "/testgtk_dir/d" Makefile.in
-
- # remove lib stripping
- sed -i -e "s: strip \$(LIBNAME)::" src/Makefile.common.in
-}
-
-lib_compile() {
- # some profile specific fixes first
- sed -i -e "s:\$prefix/lib\(/gtkada\)*:${AdalibLibTop}/$1/gtkada:" \
- src/tools/gtkada-config.in
-
- local myconf
- use opengl && myconf="--with-GL=auto" || myconf="--with-GL=no"
-
- econf ${myconf} $(use_enable nls) || die "./configure failed"
-
- # bug #279962
- emake -j1 GNATFLAGS="${ADACFLAGS}" || die
-}
-
-lib_install() {
- # make install misses all the .so and .a files and otherwise creates more
- # problems than it's worth. Will do everything manually
- mkdir -p "${DL}"
- mv src/lib-obj/* src/*/obj/* src/tools/gtkada-config "${DL}"
- rm "${DL}"/*.o
- chmod 0444 "${DL}"/*.ali
- chmod 0755 "${DL}"/gtkada-config
-}
-
-src_install() {
- #set up environment
- echo "PATH=%DL%" > ${LibEnv}
- echo "LDPATH=%DL%" >> ${LibEnv}
- echo "ADA_OBJECTS_PATH=%DL%" >> ${LibEnv}
- echo "ADA_INCLUDE_PATH=${AdalibSpecsDir}/${PN}" >> ${LibEnv}
-
- gnat_src_install
-
- #specs
- cd "${S}"/src
- dodir "${AdalibSpecsDir}/${PN}"
- insinto "${AdalibSpecsDir}/${PN}"
- doins *.ad? glade/*.ad? gnome/*.ad? opengl/*.{ad?,c,h}
-
- #docs
- cd "${S}"
- dodoc ANNOUNCE AUTHORS README
- cp -dPr examples/ testgtk/ "${D}/usr/share/doc/${PF}"
- cd "${S}"/docs
- doinfo gtkada_ug/gtkada_ug.info
- ps2pdf gtkada_ug/gtkada_ug.ps
- ps2pdf gtkada_rm/gtkada_rm.ps
- cp gtkada_ug.pdf gtkada_rm.pdf "${D}/usr/share/doc/${PF}"
- dohtml -r gtkada_ug/{gtkada_ug.html,boxes.gif,hierarchy.jpg}
- cp -dPr gtkada_rm/gtkada_rm/ "${D}/usr/share/doc/${PF}/html"
-
- # utility stuff
- cd "${S}"
- dodir "${AdalibDataDir}/${PN}"
- insinto "${AdalibDataDir}/${PN}"
- doins -r xml/gtkada.xml projects/
-}
-
-pkg_postinst() {
- eselect gnat update
- einfo "The environment has been set up to make gnat automatically find files for"
- einfo "GtkAda. In order to immediately activate these settings please do:"
- einfo " env-update && source /etc/profile"
- einfo "Otherwise the settings will become active next time you login"
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>ada@gentoo.org</email>
- <name>Gentoo Resources for Ada</name>
-</maintainer>
-<longdescription>GtkAda is the technology that lets you implement the next generation of Ada 95 GUIs in an efficient and platform-independent manner. In addition to providing over 100 widgets and allowing you to use portable low-level drawing primitives, GtkAda has a pluggable look-and-feel and comes with a high-level GUI builder that allows round-trip GUI generation and update.</longdescription>
-</pkgmetadata>
+++ /dev/null
-DIST drizzle-7.2.4-alpha.tar.gz 20075673 SHA256 dddc58949c28ccbdd8351b25540858235a7d98efb634e7bc98abd4f5ab034677 SHA512 1053c9b73588542b32398168fc4aae96a19479222571fb4ba35feb1fa6e99961366fc63a4141bf86bdba7f5db1960ed895b3a688789d05ee8d4bd46d0ab681cd WHIRLPOOL 4b2e97f7276eb447f27bc5b0244e31d47cba2acc0fde16d6e10dc0d47ba680885e035b9cf9dda8dff171279a76fbd24f34d2754ac1342b203d56316bb4d34233
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit python flag-o-matic libtool autotools eutils pam user versionator
-
-MY_P="${P}-alpha"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Database optimized for Cloud and Net applications"
-HOMEPAGE="http://drizzle.org"
-SRC_URI="https://launchpad.net/drizzle/$(get_version_component_range 1-2)/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap v8"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
- sys-libs/readline
- sys-apps/util-linux
- dev-libs/libpcre
- dev-libs/openssl
- >=dev-libs/libevent-1.4
- >=dev-libs/protobuf-2.1.0
- dev-libs/libaio
- >=dev-libs/boost-1.52.0-r1:=[threads]
- gearman? ( >=sys-cluster/gearmand-0.12 )
- pam? ( sys-libs/pam )
- curl? ( net-misc/curl )
- memcache? ( >=dev-libs/libmemcached-0.39 )
- md5? ( >=dev-libs/libgcrypt-1.4.2:0 )
- ldap? ( net-nds/openldap )
- v8? ( dev-lang/v8 )
- !dev-db/libdrizzle"
-
-DEPEND="${RDEPEND}
- =dev-lang/python-2*
- sys-devel/gettext
- dev-util/intltool
- dev-util/gperf
- sys-devel/flex
- dev-python/sphinx
- doc? ( app-doc/doxygen )"
-
-pkg_setup() {
- enewuser drizzle -1 -1 /dev/null nogroup
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-7.2.3-libtool.patch" \
- "${FILESDIR}/${PN}-7.2.3+automake-1.12.patch" \
- "${FILESDIR}/${PN}-7.2.4+boost-1.50.patch" \
- "${FILESDIR}/${P}-fix-boost_thread-detection.patch"
-
- python_convert_shebangs -r 2 .
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- if use debug; then
- append-cppflags -DDEBUG
- fi
-
- # while I applaud upstreams goal of 0 compiler warnings
- # the 1412 release didn't achieve it.
- append-flags -Wno-error
-
- # NOTE disable-all and without-all no longer recognized options
- # NOTE using --enable on some plugins can cause test failures.
- # --with should be used instead. A discussion about this here:
- # https://bugs.launchpad.net/drizzle/+bug/598659
- # TODO (upstream)
- # $(use_with memcache memcached-stats-plugin) \
- # $(use_with memcache memcached-functions-plugin) \
-
- econf \
- --disable-static \
- --disable-dependency-tracking \
- --disable-mtmalloc \
- --without-hello-world-plugin \
- --disable-rabbitmq-plugin --without-rabbitmq-plugin \
- --disable-zeromq-plugin --without-zeromq-plugin \
- --with-auth-test-plugin \
- --with-auth-file-plugin \
- --with-simple-user-policy-plugin \
- --enable-logging-stats-plugin \
- --with-logging-stats-plugin \
- --enable-console-plugin \
- $(use_enable gearman libgearman) \
- $(use_enable ldap libldap) \
- $(use_enable memcache libmemcached) \
- $(use_enable tcmalloc) \
- $(use_with curl auth-http-plugin) \
- $(use_with gearman gearman-udf-plugin) \
- $(use_with gearman logging-gearman-plugin) \
- $(use_with ldap auth-ldap-plugin) \
- $(use_with md5 md5-plugin) \
- $(use_with pam auth-pam-plugin) \
- $(use_with v8 js-plugin) \
- ${myconf}
-}
-
-src_compile() {
- emake V=1 all $(use doc && echo doxygen)
-}
-
-# currently not working as of 7.2.3
-RESTRICT=test
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- eerror "You cannot run tests as root."
- eerror "Please enable FEATURES=userpriv before proceeding."
- return 1
- fi
-
- default
-}
-
-DOCS=( AUTHORS NEWS README )
-
-src_install() {
- default
-
- find "${D}" -name '*.la' -delete || die
-
- if use doc; then
- docinto apidoc
- pushd docs/html
- dohtml -r .
- popd
- fi
-
- newinitd "${FILESDIR}"/drizzle.init.d.2 drizzled
- newconfd "${FILESDIR}"/drizzle.conf.d drizzled
-
- if ! use gearman; then
- sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \
- || die "unable to sed init script (gearman)"
- fi
-
- if ! use memcache; then
- sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \
- || die "unable to sed init script (memcache)"
- fi
-
- keepdir /var/log/drizzle
- keepdir /var/lib/drizzle/drizzled
- keepdir /etc/drizzle
-
- fperms 0755 /var/log/drizzle
- fperms -R 0700 /var/lib/drizzle
-
- fowners drizzle:nogroup /var/log/drizzle
- fowners -R drizzle:nogroup /var/lib/drizzle
-
- pamd_mimic system-auth drizzle auth account session
-}
+++ /dev/null
-Index: drizzle-7.2.3/m4/pandora_canonical.m4
-===================================================================
---- drizzle-7.2.3.orig/m4/pandora_canonical.m4
-+++ drizzle-7.2.3/m4/pandora_canonical.m4
-@@ -98,9 +98,9 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
- AC_CANONICAL_TARGET
-
- m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[
-- AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar)
-+ AM_INIT_AUTOMAKE(-Wall -Wno-portability subdir-objects foreign tar-ustar)
- ],[
-- AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign tar-ustar)
-+ AM_INIT_AUTOMAKE(-Wall -Wno-portability nostdinc subdir-objects foreign tar-ustar)
- ])
-
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-Index: drizzle-7.2.3/tests/include.am
-===================================================================
---- drizzle-7.2.3.orig/tests/include.am
-+++ drizzle-7.2.3/tests/include.am
-@@ -101,10 +101,10 @@ EXTRA_DIST += \
- check-local: tests/var/drizzle test-drizzle
-
- tests/var:
-- $(mkdir_p) tests/var
-+ $(MKDIR_P) tests/var
-
- tests/var/drizzle: tests/var
-- $(mkdir_p) tests/var/drizzle
-+ $(MKDIR_P) tests/var/drizzle
-
-
- # dtr - a shortcut for executing test-run.pl
+++ /dev/null
-Index: drizzle-7.2.3/libdrizzle-1.0/include.am
-===================================================================
---- drizzle-7.2.3.orig/libdrizzle-1.0/include.am
-+++ drizzle-7.2.3/libdrizzle-1.0/include.am
-@@ -48,7 +48,7 @@ libdrizzle_1_0_libdrizzle_la_LDFLAGS= \
- -version-info \
- $(LIBDRIZZLE_LIBRARY_VERSION)
-
--libdrizzle_1_0_libdrizzle_la_LIBADD= $(LIBSSL)
-+libdrizzle_1_0_libdrizzle_la_LIBADD= $(LTLIBSSL)
-
- libdrizzle_1_0_libdrizzle_la_SOURCES= \
- libdrizzle/column.cc \
+++ /dev/null
-Index: drizzle-7.2.4-alpha/client/drizzleslap.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/client/drizzleslap.cc
-+++ drizzle-7.2.4-alpha/client/drizzleslap.cc
-@@ -1934,7 +1934,7 @@ static void timer_thread()
- boost::mutex::scoped_lock scopedLock(timer_alarm_mutex);
-
- boost::xtime xt;
-- xtime_get(&xt, boost::TIME_UTC);
-+ xtime_get(&xt, boost::TIME_UTC_);
- xt.sec += opt_timer_length;
-
- (void)timer_alarm_threshold.timed_wait(scopedLock, xt);
-Index: drizzle-7.2.4-alpha/configure.ac
-===================================================================
---- drizzle-7.2.4-alpha.orig/configure.ac
-+++ drizzle-7.2.4-alpha/configure.ac
-@@ -111,7 +111,6 @@ PANDORA_DRIZZLE_BUILD
- PANDORA_HAVE_BOOST_TEST
- PANDORA_HAVE_LIBSQLITE3
-
--
- #########################################################################
-
-
-Index: drizzle-7.2.4-alpha/drizzled/drizzled.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/drizzled.cc
-+++ drizzle-7.2.4-alpha/drizzled/drizzled.cc
-@@ -460,7 +460,7 @@ void close_connections()
- while (select_thread_in_use)
- {
- boost::xtime xt;
-- xtime_get(&xt, boost::TIME_UTC);
-+ xtime_get(&xt, boost::TIME_UTC_);
- xt.sec += 2;
-
- for (uint32_t tmp=0 ; tmp < 10 && select_thread_in_use; tmp++)
-Index: drizzle-7.2.4-alpha/drizzled/table/cache.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/table/cache.cc
-+++ drizzle-7.2.4-alpha/drizzled/table/cache.cc
-@@ -263,7 +263,7 @@ bool Cache::removeTable(Session& session
- table::Cache::removeTable routine.
- */
- boost::xtime xt;
-- xtime_get(&xt, boost::TIME_UTC);
-+ xtime_get(&xt, boost::TIME_UTC_);
- xt.sec += 10;
- boost::mutex::scoped_lock scoped(table::Cache::mutex(), boost::adopt_lock_t());
- COND_refresh.timed_wait(scoped, xt);
-Index: drizzle-7.2.4-alpha/drizzled/thr_lock.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/thr_lock.cc
-+++ drizzle-7.2.4-alpha/drizzled/thr_lock.cc
-@@ -170,7 +170,7 @@ static enum enum_thr_lock_result wait_fo
- if (can_deadlock)
- {
- boost::xtime xt;
-- xtime_get(&xt, boost::TIME_UTC);
-+ xtime_get(&xt, boost::TIME_UTC_);
- xt.sec += table_lock_wait_timeout;
- if (not cond->timed_wait(scoped, xt))
- {
-Index: drizzle-7.2.4-alpha/plugin/sleep/sleep.cc
-===================================================================
---- drizzle-7.2.4-alpha.orig/plugin/sleep/sleep.cc
-+++ drizzle-7.2.4-alpha/plugin/sleep/sleep.cc
-@@ -98,7 +98,7 @@ int64_t Item_func_sleep::val_int()
-
- try {
- boost::xtime xt;
-- xtime_get(&xt, boost::TIME_UTC);
-+ xtime_get(&xt, boost::TIME_UTC_);
- xt.nsec += (uint64_t)(dtime * 1000000000ULL);
- session.getThread()->sleep(xt);
- }
-Index: drizzle-7.2.4-alpha/drizzled/message/include.am
-===================================================================
---- drizzle-7.2.4-alpha.orig/drizzled/message/include.am
-+++ drizzle-7.2.4-alpha/drizzled/message/include.am
-@@ -40,7 +40,7 @@ lib_LTLIBRARIES += drizzled/message/libd
- drizzled_message_libdrizzledmessage_la_CXXFLAGS = ${MESSAGE_AM_CXXFLAGS} ${NO_WERROR}
-
- drizzled_message_libdrizzledmessage_la_SOURCES = drizzled/message/statement_transform.cc
--drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) drizzled/libcharset.la
-+drizzled_message_libdrizzledmessage_la_LIBADD= ${LTLIBPROTOBUF} $(GCOV_LIBS) $(BOOST_LIBS) drizzled/libcharset.la
-
- nobase_dist_pkginclude_HEADERS+= \
- drizzled/message/statement_transform.h
+++ /dev/null
---- m4/pandora_have_libboost_thread.m4.orig 2014-02-12 13:52:43.580001598 +0400
-+++ m4/pandora_have_libboost_thread.m4 2014-02-12 13:53:24.288002974 +0400
-@@ -17,13 +17,13 @@
- CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}"
-
- AC_LANG_PUSH(C++)
-- AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[
-+ AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,boost_system-mt,[
- #include <boost/thread.hpp>
- ],[
- boost::thread id;
- ])
- AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[
-- AC_LIB_HAVE_LINKFLAGS(boost_thread,,[
-+ AC_LIB_HAVE_LINKFLAGS(boost_thread,boost_system,[
- #include <boost/thread.hpp>
- ],[
- boost::thread id;
+++ /dev/null
-DRIZZLE_EXTRA=""
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2011 Pavel Stratil, senbonzakura.eu
-# Some functions were taken from debian init script. Licensed under GPL-2
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#########################
-### Construct vars ######
-#########################
-
-
-SUFFIX=".${SVCNAME#*.}"
-[ "${SUFFIX}" == ".drizzled" ] && SUFFIX=''
-
-BASE_CNF="/etc/drizzle/drizzled"
-BASE_PID="/var/run/drizzle/drizzled"
-BASE_LOG="/var/log/drizzle/drizzled"
-BASE_DIR="/var/lib/drizzle/drizzled"
-
-PIDFILE="${BASE_PID}${SUFFIX}.pid"
-CNFFILE="${BASE_CNF}${SUFFIX}.cnf"
-LOGFILE="${BASE_LOG}${SUFFIX}.log"
-DATADIR="${BASE_DIR}${SUFFIX}"
-DRIZZLE="/usr/bin/drizzle"
-DRIZZLE_USER="drizzle"
-DRIZZLE_DAEMON="/usr/sbin/drizzled"
-DRIZZLE_EXTRA=""
-
-#########################
-### Helper functions ####
-#########################
-
-
-#
-# drizzle_status() checks if there is a server running and if it is accessible.
-# "check_alive" insists on a pingable server, "check_dead" also fails
-# if there is a lost drizzled in the process list
-# Usage: boolean drizzle_status [check_alive|check_dead] [warn|nowarn]
-#
-drizzle_status() {
- ping_output=`$DRIZZLE --ping 2>&1`; ping_alive=$(( ! $? ))
- ps_alive=0
- if [ -f "$PIDFILE" ] && ps `cat $PIDFILE` >/dev/null 2>&1; then ps_alive=1; fi
-
- if [ "$1" = "check_alive" -a $ping_alive = 1 ] ||
- [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then
- return 0 # EXIT_SUCCESS
- else
- if [ "$2" = "warn" ]; then
- echo -e "$ps_alive processes alive and '$DRIZZLE --ping' resulted in\n$ping_output\n"
- fi
- return 1 # EXIT_FAILURE
- fi
-}
-
-#########################
-### Main ################
-#########################
-
-checkconfig() {
- # TODO: --print-defaults no longer a valid option. Needs to be rewritten.
- #CNFDATADIR=`drizzle_get_param datadir`
- #if [ -z "${CNFDATADIR}" ] ; then
- # ewarn "Datadir not set in ${CNFFILE}."
- # ewarn "Trying to use ${DATADIR}"
- #else
- DATADIR="${CNFDATADIR}"
- #fi
-
- if [[ ! -d "${DATADIR}" ]] ; then
- eerror "Drizzle datadir is empty or invalid."
- eerror "Please check your configuration ${CNFFILE} and DRIZZLE_EXTRA"
- return 1
- fi
-
- if [ ! -f "${CNFFILE}" ]; then
- eerror "The configuration file $CNFFILE was not found!"
- fi
-}
-
-depend() {
- use localmount
- use gearmand
- use memcached
-
- # TODO use drizzle_get_param() to decide if gearmand and memcached
- # are needed. Then the useflag based sed-ing of this script
- # can be removed from the ebuild.
-}
-
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --pidfile ${PIDFILE} --stop \
- --exec ${DRIZZLE_DAEMON}
- eend $?
- drizzle_status check_dead warn
-}
-
-start() {
- #checkconfig
- ebegin "Starting ${SVCNAME}"
- # Test if ${BASE_PID}, ${BASE_LOG} and ${LOG_FILE} exist, create if not.
- [ ! -e ${BASE_PID} ] && mkdir -p ${BASE_PID} && chown ${DRIZZLE_USER}:nogroup ${BASE_PID}
- [ ! -e ${BASE_LOG} ] && mkdir -p ${BASE_LOG} && chown ${DRIZZLE_USER}:nogroup ${BASE_LOG}
- [ ! -e ${LOGFILE} ] && touch ${LOGFILE} && chown ${DRIZZLE_USER}:nogroup ${LOGFILE}
- start-stop-daemon --background --pidfile ${PIDFILE} --stderr ${LOGFILE} \
- --user ${DRIZZLE_USER} --start --exec ${DRIZZLE_DAEMON} -- \
- --datadir=${DATADIR} --pid-file=${PIDFILE} --user=${DRIZZLE_USER} \
- ${DRIZZLE_EXTRA}
- eend $?
-
- # TODO in order to have replication always working we should add the
- # --server-id=# option. AFAIK only integers are allowed, though
- # ${HOSTNAME}${SVCNAME}${SUFFIX} whould be much easier to handle.
-
- for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
- sleep 1
- if drizzle_status check_alive nowarn ; then break ; fi
- done
- if drizzle_status check_alive warn ; then
- einfo "${SVCNAME} is alive!"
- else
- eerror "${SVCNAME} died!"
- fi
-}
-
-status() {
- if drizzle_status check_alive nowarn; then
- einfo "status: started"
- else
- einfo "status: stopped"
- fi
-}
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2012 Pavel Stratil, senbonzakura.eu
-# Some functions were taken from debian init script. Licensed under GPL-2
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-#########################
-### Construct vars ######
-#########################
-
-
-SUFFIX=".${SVCNAME#*.}"
-[ "${SUFFIX}" == ".drizzled" ] && SUFFIX=''
-
-DIR_PID="/run/drizzle"
-DIR_LOG="/var/log/drizzle"
-
-BASE_CNF="/etc/drizzle/drizzled"
-BASE_PID="${DIR_PID}/drizzled"
-BASE_LOG="${DIR_LOG}/drizzled"
-BASE_DIR="/var/lib/drizzle/drizzled"
-
-CNFFILE="${BASE_CNF}${SUFFIX}.cnf"
-LOGFILE="${BASE_LOG}${SUFFIX}.log"
-DATADIR="${BASE_DIR}${SUFFIX}"
-DRIZZLE="/usr/bin/drizzle"
-DRIZZLE_USER="drizzle"
-
-pidfile="${BASE_PID}${SUFFIX}.pid"
-command="/usr/sbin/drizzled"
-command_args="--daemon --datadir=${DATADIR} --pid-file=${pidfile} --user=${DRIZZLE_USER} --syslog.errmsg-enable ${DRIZZLE_EXTRA}"
-
-start_stop_daemon_args="--user ${DRIZZLE_USER} --wait 5000"
-
-#########################
-### Helper functions ####
-#########################
-
-
-#
-# drizzle_status() checks if there is a server running and if it is accessible.
-# "check_alive" insists on a pingable server, "check_dead" also fails
-# if there is a lost drizzled in the process list
-# Usage: boolean drizzle_status [check_alive|check_dead] [warn|nowarn]
-#
-drizzle_status() {
- ping_output=`$DRIZZLE --ping 2>&1`; ping_alive=$(( ! $? ))
- ps_alive=0
- if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
-
- if [ "$1" = "check_alive" -a $ping_alive = 1 ] ||
- [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then
- return 0 # EXIT_SUCCESS
- else
- if [ "$2" = "warn" ]; then
- echo -e "$ps_alive processes alive and '$DRIZZLE --ping' resulted in\n$ping_output\n"
- fi
- return 1 # EXIT_FAILURE
- fi
-}
-
-#########################
-### Main ################
-#########################
-
-checkconfig() {
- # TODO: --print-defaults no longer a valid option. Needs to be rewritten.
- #CNFDATADIR=`drizzle_get_param datadir`
- #if [ -z "${CNFDATADIR}" ] ; then
- # ewarn "Datadir not set in ${CNFFILE}."
- # ewarn "Trying to use ${DATADIR}"
- #else
- DATADIR="${CNFDATADIR}"
- #fi
-
- if [[ ! -d "${DATADIR}" ]] ; then
- eerror "Drizzle datadir is empty or invalid."
- eerror "Please check your configuration ${CNFFILE} and DRIZZLE_EXTRA"
- return 1
- fi
-
- if [ ! -f "${CNFFILE}" ]; then
- eerror "The configuration file $CNFFILE was not found!"
- fi
-}
-
-depend() {
- use localmount
- use logger
- use gearmand
- use memcached
-
- # TODO use drizzle_get_param() to decide if gearmand and memcached
- # are needed. Then the useflag based sed-ing of this script
- # can be removed from the ebuild.
-}
-
-start_pre() {
- checkpath -d -o ${DRIZZLE_USER}:nogroup ${DIR_PID} ${DIR_LOG}
- checkpath -f -o ${DRIZZLE_USER}:nogroup ${LOGFILE}
-}
-
-start_post() {
- for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
- sleep 1
- if drizzle_status check_alive nowarn ; then break ; fi
- done
- if drizzle_status check_alive warn ; then
- einfo "${SVCNAME} is alive!"
- else
- eerror "${SVCNAME} died!"
- fi
-}
-
-stop_post() {
- drizzle_status check_dead warn
-}
-
-status() {
- if drizzle_status check_alive nowarn; then
- mark_service_started drizzled
- einfo "status: started"
- else
- mark_service_stopped drizzled
- einfo "status: stopped"
- fi
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pavel.stratil-jun@fenix.cz</email>
- <description>Proxied co-maintainer, assign bugs to him</description>
- </maintainer>
- <maintainer type="person">
- <email>flameeyes@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="doc">
- Build the API documentation for the package, using
- <pkg>app-doc/doxygen</pkg>. Warning, this might take over an
- hour on slower machines.
- </flag>
- <flag name="memcache">
- Enable the memcache plugin for user-defined functions and
- statistics in I_S tables (using
- <pkg>dev-libs/libmemcached</pkg>).
-
- Currently restricts tests because of an upstream testsuite bug.
- </flag>
- <flag name="gearman">
- Enable the gearman plugins for user-defined functions and
- logging (using <pkg>sys-cluster/gearman</pkg>).
- </flag>
- <flag name="curl">
- Enable the HTTP authentication plugin (using
- <pkg>net-misc/curl</pkg>). This is needed for the tests to apply
- properly.
- </flag>
- <flag name="pam">
- Enable the PAM authentication plugin (using
- <pkg>sys-libs/pam</pkg>). The configuration file created will be
- /etc/pam.d/drizzle.
- </flag>
- <flag name="md5">
- Enable the MD5 plugin, using <pkg>dev-libs/libgcrypt</pkg>; this
- replaces the older openssl and gnutls USE flags.
- </flag>
- <flag name="v8">
- Use <pkg>dev-lang/v8</pkg>.
- </flag>
- </use>
- <upstream>
- <remote-id type="launchpad">drizzle</remote-id>
- </upstream>
-</pkgmetadata>
+++ /dev/null
-DIST CGI-SpeedyCGI-2.22.tar.gz 151946 SHA256 9021a5c6d8ed205422f091209addf7d1be27222adbcbd17bc52fbc527bcc6f98 SHA512 e29112c2dcc2d7494bd06a92ec80ba8b424b66fba78148e2e8dfc7aa3c51379f9cbc5aabc146199ce9190815de6f0da5da1d0d68e1ff499a663384523235fb38 WHIRLPOOL d7ea153a5b1c7b0e341fbed7e19178e3eb3fb2e588c26aaeb2b58f6616e8996edfb0ec16874d90dc81080c428e9a6a0e0ffb39fa55872ee461b799470c10c2d7
-DIST speedy-error.patch 3087 SHA256 9da44c9c7c5068c214e52076e011d5485f077e26080ddabd1ab1eda854605c6d SHA512 d58b31732a285f518040440a8dfa26f590a68ccef0ad7f9083b8752643477a3bd2ef5ec6833e6d1f331d72096ffa25a1840d9e2aab4732cf818b5fcbcb96de52 WHIRLPOOL d87a5cc6ea301037e0a460a32222505660325c2a46e04fa1c4a413cae11c5ae2c78831d0de072c6cbdaf6bb95e282bf70cb1f781f71dd01291de0e7d9b5a5283
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="Speed up perl scripts by running them persistently"
-HOMEPAGE="http://daemoninc.com/SpeedyCGI/"
-SRC_URI="http://daemoninc.com/SpeedyCGI/CGI-${P}.tar.gz
- http://oss.oetiker.ch/smokeping/pub/speedy-error.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/CGI-${P}
-
-PATCHES=( "${DISTDIR}/speedy-error.patch"
-"${FILESDIR}/${P}-makefile-manpage.patch"
-"${FILESDIR}/${P}-empty-param.patch"
-"${FILESDIR}/${P}-strerror.patch"
-"${FILESDIR}/${P}-apache-docs.patch"
-"${FILESDIR}/${P}-apache2.2.patch"
-"${FILESDIR}/${P}-strip-backend-libs.patch"
-"${FILESDIR}/${P}-test-timeout.patch"
-"${FILESDIR}/${P}-speedy_unsafe_putenv.patch"
-"${FILESDIR}/${P}-perl5.10.patch"
-"${FILESDIR}/${P}-perl_sys_init.patch"
-"${FILESDIR}/${P}-uninit-crash.patch"
-"${FILESDIR}/${P}-big-socket-buffers.patch"
-"${FILESDIR}/${P}-ldflags.patch"
-"${FILESDIR}/${P}-parallel-build.patch"
-)
-
-# Actually fails 1 test
-SRC_TEST="do parallel"
-MAKEOPTS="${MAKEOPTS} -j1" #348065
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Documentation for bug #204461.
---- a/src/SpeedyCGI.src
-+++ b/src/SpeedyCGI.src
-@@ -250,6 +250,13 @@
- be Speedy followed by the option name. For example to set the
- Timeout option, use the apache directive SpeedyTimeout.
-
-+Note that these variables are global. There is currently no way to run
-+different scripts with different SpeedyCGI options when they are run
-+from the Apache module. Any <Directory> or <Location> contexts
-+have no effect on the scope of the SpeedyCGI options. When the
-+same SpeedyCGI option is set several times, the last one overrides
-+the others.
-+
- =back
-
- =head2 Context
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Apache 2.2 compatibility fixes (#393017):
-* APR_BRIGADE_FOREACH macro removal
-* apr_filename_of_pathname() rename
---- a/src/mod_speedycgi2.c
-+++ b/src/mod_speedycgi2.c
-@@ -340,7 +340,10 @@
- const char *buf;
- apr_size_t len;
- apr_status_t rv;
-- APR_BRIGADE_FOREACH(e, bb) {
-+ for (e = APR_BRIGADE_FIRST(bb);
-+ e != APR_BRIGADE_SENTINEL(bb);
-+ e = APR_BUCKET_NEXT(e)) {
-+
- if (APR_BUCKET_IS_EOS(e)) {
- break;
- }
-@@ -380,7 +383,7 @@
- return DECLINED;
- }
-
-- argv0 = apr_filename_of_pathname(r->filename);
-+ argv0 = apr_filepath_name_get(r->filename);
- nph = !(strncmp(argv0, "nph-", 4));
-
- if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r))
-@@ -436,7 +439,7 @@
- if ((rv = default_build_command(&command, &argv, r, p)) != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
- "don't know how to spawn child process: %s",
-- apr_filename_of_pathname(r->filename));
-+ apr_filepath_name_get(r->filename));
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-
-@@ -445,7 +448,7 @@
- command, argv, r, p)) != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_TOCLIENT, rv, r,
- "couldn't spawn child process: %s",
-- apr_filename_of_pathname(r->filename));
-+ apr_filepath_name_get(r->filename));
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-
-@@ -465,7 +468,9 @@
- return rv;
- }
-
-- APR_BRIGADE_FOREACH(bucket, bb) {
-+ for (bucket = APR_BRIGADE_FIRST(bb);
-+ bucket != APR_BRIGADE_SENTINEL(bb);
-+ bucket = APR_BUCKET_NEXT(bucket)) {
- const char *data;
- apr_size_t len;
-
+++ /dev/null
-Author: Niko Tyni <ntyni@debian.org>
-Description: fix the detach test on systems with a large socket buffer size (#584344)
---- speedy-cgi-perl.orig/speedy/t/detach.t
-+++ speedy-cgi-perl/speedy/t/detach.t
-@@ -6,9 +6,22 @@
-
- use strict;
- use IO::File;
-+use Socket;
-
- my $smbuf = 8 * 1024;
--my $lgbuf = 512 * 1024;
-+my $lgbuf;
-+
-+# find out the size of the socket write buffer
-+# see http://bugs.debian.org/584344
-+my $s;
-+if (socket($s, AF_UNIX, SOCK_STREAM, 0) &&
-+ (my $packed_size = getsockopt($s, SOL_SOCKET, SO_SNDBUF))) {
-+ $lgbuf = $smbuf + 2 * unpack("I", $packed_size);
-+} else {
-+ warn("socket() or getsockopt() failed: $!");
-+}
-+
-+$lgbuf = 512 * 1024 if $lgbuf < 512 * 1024;
- my $scr = 't/scripts/detach';
-
- use vars qw(@open_files @pids %children);
-@@ -23,7 +36,7 @@
- $| = 1; print ""; $| = 0;
- my $child;
- if (($child = open($fh, "-|")) == 0) {
-- open(F, "$ENV{SPEEDY} -- -B$sz $scr |");
-+ open(F, "$ENV{SPEEDY} -- -B$sz $scr $lgbuf |");
- print scalar <F>;
- close(STDOUT);
- sleep 60; # Simulate slow drain of output
---- speedy-cgi-perl.orig/speedy/t/scripts/detach
-+++ speedy-cgi-perl/speedy/t/scripts/detach
-@@ -1,3 +1,6 @@
- $| = 1;
-+# the data should not fit in the socket write buffer
-+# see http://bugs.debian.org/584344
-+my $size = shift || (512 * 1024);
- print "$$\n";
--print 'x' x (500*1024);
-+print 'x' x int(500 / 512 * $size);
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Allow empty strings as command-line parameters
---- a/src/speedy_frontend.c
-+++ b/src/speedy_frontend.c
-@@ -535,7 +535,26 @@
- ADD_STRING(b, s, l);
- }
- }
-+ /* Terminate with zero-length string */
-+ ADDCHAR(b, 0);
-+}
-+
-+/* Copy a block of strings into the buffer, including empty strings */
-+static void add_strings_with_empty(register SpeedyBuf *b, register const char * const * p)
-+{
-+ int l;
-+ register const char *s;
-
-+ /* Add strings in p array */
-+ for (; (s = *p); ++p) {
-+ if ((l = strlen(s))) {
-+ ADD_STRING(b, s, l);
-+ } else {
-+ /* add a 1-byte long string containing just '\0' */
-+ l = 1;
-+ ADD_STRING(b, s, l);
-+ }
-+ }
- /* Terminate with zero-length string */
- ADDCHAR(b, 0);
- }
-@@ -560,7 +579,7 @@
-
- /* Add env and argv */
- add_strings(sb, envp);
-- add_strings(sb, scr_argv+1);
-+ add_strings_with_empty(sb, scr_argv+1);
-
- /* Put script filename into buffer */
- add_string(sb, script_fname, strlen(script_fname));
+++ /dev/null
-=== modified file 'src/SpeedyMake.pl'
---- src/SpeedyMake.pl 2010-08-30 20:08:42 +0000
-+++ src/SpeedyMake.pl 2010-08-30 20:09:18 +0000
-@@ -328,7 +328,7 @@
- sub remove_libs { undef }
-
- sub get_ldopts {
-- $_ = "$LD_OPTS " . &ExtUtils::Embed::ldopts('-std');
-+ $_ = "$LD_OPTS " . &ExtUtils::Embed::ldopts('-std') . " " . $ENV{LDFLAGS};
- $EFENCE && s/$/ $EFENCE/;
- return $_;
- }
-
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Makefile.PL tries to be too smart, make it generate a manpage.
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -34,9 +34,9 @@
- VERSION_FROM => 'src/SpeedyCGI.src',
- EXE_FILES => [qw(speedy/speedy speedy_backend/speedy_backend)],
- CONFIGURE => sub { return {DIR=>\@dirs} },
-- PM => {'src/SpeedyCGI.pm'=>'$(INST_LIBDIR)/SpeedyCGI.pm'},
-+ # PM => {'src/SpeedyCGI.pm'=>'$(INST_LIBDIR)/SpeedyCGI.pm'},
- MAN1PODS => {},
-- MAN3PODS => {},
-+ # MAN3PODS => {},
- dist => {DIST_DEFAULT => 'mydist'},
- realclean => {FILES => 'README README.html lib'},
- %write_makefile_common
+++ /dev/null
-=== modified file 'Makefile.PL'
---- Makefile.PL 2010-09-16 06:16:42 +0000
-+++ Makefile.PL 2010-09-16 20:24:41 +0000
-@@ -64,6 +64,12 @@
- $test_install_extra .
- '
-
-+speedy/speedy: subdirs
-+ $(NOECHO) cd speedy && $(MAKE) $(USEMAKEFILE) $(FIRST_MAKEFILE) all $(PASTHRU)
-+
-+speedy_backend/speedy_backend: subdirs
-+ $(NOECHO) cd speedy_backend && $(MAKE) $(USEMAKEFILE) $(FIRST_MAKEFILE) all $(PASTHRU)
-+
- mydist: README README.html lib/CGI/SpeedyCGI.pm readable tardist
-
- readable:
-
+++ /dev/null
-Author: Niko Tyni <ntyni@debian.org>
-Description: Fix build failures with Perl 5.10.
-Pod::Text::pod2text() calling conventions changed
-use Newx() instead of New()
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -71,7 +71,7 @@
- chmod -R u+w,go-w,go+r .
-
- README: src/SpeedyCGI.pm
-- cd src && $(PERL) -e "use Pod::Text; pod2text(-80)" <SpeedyCGI.pm >../README
-+ cd src && pod2text -80 <SpeedyCGI.pm >../README
-
- README.html: src/SpeedyCGI.pm
- cd src && pod2html SpeedyCGI.pm >../README.html && $(RM_F) pod2h*
---- a/src/speedy_backend_main.h
-+++ b/src/speedy_backend_main.h
-@@ -38,7 +38,7 @@
-
- #else
-
--#define speedy_new(s,n,t) New(123,s,n,t)
-+#define speedy_new(s,n,t) Newx(s,n,t)
- #define speedy_renew Renew
- #define speedy_free Safefree
-
+++ /dev/null
-Author: Niko Tyni <ntyni@debian.org>
-Description: Properly call PERL_SYS_INIT3() to fix lockups on hppa with perl 5.10.0. (Closes: #486070)
-
-This was always buggy but didn't bite until now. From 'perldoc perlembed':
-
-The macros PERL_SYS_INIT3() and PERL_SYS_TERM() provide system-specific
-tune up of the C runtime environment necessary to run Perl interpreters
---- a/src/speedy_backend_main.c
-+++ b/src/speedy_backend_main.c
-@@ -170,6 +170,8 @@
- int i;
- SigList sl;
-
-+ PERL_SYS_INIT3(&argc, &argv, &_junk);
-+
- speedy_util_unlimit_core();
-
- if (!(my_perl = perl_alloc()))
---- a/src/speedy_perl.c
-+++ b/src/speedy_perl.c
-@@ -405,6 +405,7 @@
-
- perl_destruct(my_perl);
- }
-+ PERL_SYS_TERM();
- speedy_util_exit(0,0);
- }
-
+++ /dev/null
-Author: banb@yahoo.co.jp
-Description: Debian #418447, CPAN #13521
-http://rt.cpan.org/Public/Bug/Display.html?id=13521
---- a/src/speedy_backend_main.c
-+++ b/src/speedy_backend_main.c
-@@ -176,6 +176,10 @@
- DIE_QUIET("Cannot allocate perl");
- perl_construct(my_perl);
-
-+#if defined(PL_use_safe_putenv) || defined(PL_Guse_safe_putenv)
-+ PL_use_safe_putenv = 0;
-+#endif
-+
- #ifdef SPEEDY_DEBUG
- dont_fork = getenv("SPEEDY_NOPARENT") != NULL;
- #endif
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Don't crash while printing a fatal error.
---- a/src/speedy_util.c
-+++ b/src/speedy_util.c
-@@ -96,13 +96,42 @@
- }
-
- static void just_die(const char *fmt, va_list ap) {
-+ /*
-+ * All this strerror_r() stuff is here because
-+ * including perl.h in some cases (Perl 5.8?) replaces
-+ * strerr() with a wrapper that needs an embedded perl
-+ * interpreter running. Otherwise we get SIGSEGV when
-+ * accessing interpreter-specific global variables for the
-+ * strerror buffer
-+ *
-+ * Furthermore, there are two implementations of
-+ * strerror_r() out there, with different prototypes.
-+ */
-+
- char buf[2048];
-+#ifdef HAS_STRERROR_R
-+ char errbuf[256];
-+ int errsv;
-+#endif
-
- sprintf(buf, "%s[%u]: ", SPEEDY_PROGNAME, (int)getpid());
- vsprintf(buf + strlen(buf), fmt, ap);
- if (errno) {
- strcat(buf, ": ");
-+#ifdef HAS_STRERROR_R
-+#ifdef _GNU_SOURCE
-+ strcat(buf, strerror_r(errno, errbuf, sizeof(errbuf)));
-+#else /* ! _GNU_SOURCE */
-+ errsv = errno;
-+ if (strerror_r(errsv, errbuf, sizeof(errbuf))
-+ sprintf(buf + strlen(buf), "(errno = %d)", errsv);
-+ else
-+ strcat(buf, errbuf);
-+ }
-+#endif
-+#else /* ! HAS_STRERROR_R */
- strcat(buf, strerror(errno));
-+#endif /* HAS_STRERROR_R */
- }
- strcat(buf, "\n");
- # ifdef SPEEDY_DEBUG
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Use the automatic 'remove extra libs' feature with speedy_backend too.
-These unnecessary linking flags get removed: -lm -lcrypt -lpthread
---- a/speedy_backend/Makefile.PL
-+++ b/speedy_backend/Makefile.PL
-@@ -29,6 +29,10 @@
- sub am_frontend {0}
- sub my_name {'backend'}
-
-+sub remove_libs { my $class = shift;
-+ 'BIN=speedy_backend ../util/remove_libs';
-+}
-+
- use ExtUtils::Embed;
-
- my $tmp = "xsinit.tmp$$";
---- a/util/remove_libs
-+++ b/util/remove_libs
-@@ -3,7 +3,11 @@
- # Remove extranaeous libs from the linking command. Reduces shared-library
- # overhead at exec time.
-
--BIN=speedy
-+# allow testing other binaries too
-+if [ "x$BIN" = "x" ]
-+then
-+ BIN=speedy
-+fi
- TMP1=/tmp/remove_libs$$
- TMP2="${TMP1}2"
-
+++ /dev/null
-Author: Niko Tyni <ntyni@iki.fi>
-Description: Increase the time for the backend to start so slower buildds
-have a chance. (#418717)
---- a/speedy/t/killfe.t
-+++ b/speedy/t/killfe.t
-@@ -9,7 +9,7 @@
- my $cmd = "exec $ENV{SPEEDY} -- -M1 $scr </dev/null |";
-
- my $pid = open (RUN1, $cmd);
--sleep(1);
-+sleep(3);
- kill(9, $pid);
- wait;
- open (RUN2, $cmd);
+++ /dev/null
-Author: Niko Tyni <ntyni@debian.org>
-Description: Closes: #537996
-The SvIV call crashes in on Perl 5.10.0 when warnings are
-enabled and the value is undef.
---- a/src/speedy_perl.c
-+++ b/src/speedy_perl.c
-@@ -818,7 +818,7 @@
- my_call_sv(get_perlvar(&PERLVAR_RESET_GLOBALS));
-
- /* Copy option values in from the perl vars */
-- if (SvIV(PERLVAL_OPTS_CHANGED)) {
-+ if (SvTRUE(PERLVAL_OPTS_CHANGED)) {
- int i;
- for (i = 0; i < SPEEDY_NUMOPTS; ++i) {
- OptRec *o = speedy_optdefs + i;
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>perl@gentoo.org</email>
- <name>Gentoo Perl Project</name>
- </maintainer>
-</pkgmetadata>
+++ /dev/null
-DIST drizzle-0.4.2.tgz 24106 SHA256 5e9abd5200d840249003112e7d658eda06e2591e4c6bcf1c97194b4e274f0c66 SHA512 39b4d4fd7f68fba0c13e947c5b93179c3d7a4fd563b60c5ae9f7f175a095e16d2344a924cecd8c921892b33d7fe6cb4f95cfccbfbec40be14b1f46b534cba76e WHIRLPOOL 7ff5b373738a755a9ac90b5028eafa5f98a42bd47999e78fda3174c7361929d2d316b46fa28bfb4a2c5a0e370ce211895905605254b9d44999abf53881e138a0
+++ /dev/null
-diff -aurN drizzle-0.4.2.orig/php_drizzle.c drizzle-0.4.2/php_drizzle.c
---- drizzle-0.4.2.orig/php_drizzle.c 1970-01-01 04:13:08.000000000 -0500
-+++ drizzle-0.4.2/php_drizzle.c 2014-10-22 21:38:21.882838493 -0400
-@@ -1314,9 +1314,13 @@
- }
-
- zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- sizeof(zval *));
-+#else
-+ object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
-
- value.handle= zend_objects_store_put(obj,
- (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -1582,9 +1586,13 @@
- }
-
- zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- sizeof(zval *));
-+#else
-+ object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
-
- obj->value.handle= zend_objects_store_put(obj,
- (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -2505,9 +2513,13 @@
- }
-
- zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- sizeof(zval *));
-+#else
-+ object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
-
- obj->value.handle= zend_objects_store_put(obj,
- (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -3017,9 +3029,13 @@
- }
-
- zend_object_std_init(&(result->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(result->std.properties, &(class_type->default_properties),
- (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- sizeof(zval *));
-+#else
-+ object_properties_init((zend_object*) &(result->std), class_type);
-+#endif
-
- value.handle= zend_objects_store_put(result,
- (zend_objects_store_dtor_t)zend_objects_destroy_object,
-@@ -3382,9 +3398,13 @@
- }
-
- zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(obj->std.properties, &(class_type->default_properties),
- (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
- sizeof(zval *));
-+#else
-+ object_properties_init((zend_object*) &(obj->std), class_type);
-+#endif
-
- value.handle= zend_objects_store_put(obj,
- (zend_objects_store_dtor_t)zend_objects_destroy_object,
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pavel.stratil-jun@fenix.cz</email>
- <description>Proxied co-maintainer, assign bugs to him</description>
- </maintainer>
- <maintainer type="person">
- <email>flameeyes@gentoo.org</email>
- </maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PHP_EXT_NAME="drizzle"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2 eutils
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="PHP extension using libdrizzle library to provide communcation with Drizzle and MySQL databases"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/drizzle"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local slot orig_s="${PHP_EXT_S}"
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- epatch "${FILESDIR}/${P}-php54.patch"
- #Fix tests
- mkdir ext || die
- mv drizzle_*.phpt ext || die
- done
- php-ext-source-r2_src_prepare
-}
+++ /dev/null
-DIST PyLTXML-1.3.tar.gz 27550 SHA256 4bd7a726667e48fc604bb471d775c0c42cb62a1aa77b01aa9a761012fab052f2 SHA512 0221557ec2a4311b346031a6059a7776ec30b9c34fe78e59a0e4f236931b3ab2268ed28de93429fe66f38fc855b6368eab990d5d977bca03bb4b0882136c0c1c WHIRLPOOL 6fc5ef5fba42e0b6e0ccea7424fe142c5784a488c4a171571fdc4434b28e74d9261b31a321ad7502d223c91e10f2a5d937e88d25bbd1a2d66812ddbe2a634231
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
-</maintainer>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Bindings for LTXML libraries"
-HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/"
-SRC_URI="ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/PyLTXML-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND="=dev-libs/ltxml-1.2.5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/PyLTXML-${PV}"
-
-DOCS="00README"
-PYTHON_MODNAME="PyLTXML"
-
-src_prepare() {
- distutils_src_prepare
-
- sed \
- -e s':projects/ltg/projects/lcontrib/include:usr/include:' \
- -e s':projects/ltg/projects/lcontrib/lib:usr/lib/ltxml12:' \
- -i setup.py || die "sed failed"
-}
+++ /dev/null
-DIST gnomoradio-0.15.1.tar.bz2 351723 SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a SHA512 7e9fc70054e3966e1bd6af9451c4c6eb0cd1018e422f767589ca2e86b08e2f74c520b9a9a4bd09a12ce76f4d7b7e545ac61601472ffa1818209182b026f9f882 WHIRLPOOL 7d070ee0ceac35a0432f4b690353ab5d91da37b3202e203fea7f37e55e1ae383a4c4c3415f00633677121d7974cfaf11bdbfbdaa5c7b740c608103313510c73b
+++ /dev/null
-diff -ur gnomoradio-0.15.1.orig/roboradio/audio/prober.h gnomoradio-0.15.1/roboradio/audio/prober.h
---- gnomoradio-0.15.1.orig/roboradio/audio/prober.h 2004-10-17 04:40:36.000000000 +0300
-+++ gnomoradio-0.15.1/roboradio/audio/prober.h 2008-06-29 14:48:13.000000000 +0300
-@@ -27,6 +27,7 @@
- {
- namespace Audio
- {
-+ gboolean probe (gpointer s);
- class Prober : public Audio
- {
- public:
-diff -ur gnomoradio-0.15.1.orig/roboradio/state.cc gnomoradio-0.15.1/roboradio/state.cc
---- gnomoradio-0.15.1.orig/roboradio/state.cc 2004-10-24 03:24:34.000000000 +0300
-+++ gnomoradio-0.15.1/roboradio/state.cc 2008-06-29 14:48:13.000000000 +0300
-@@ -28,6 +28,7 @@
- #include <sys/stat.h>
- #include <dirent.h>
- #include <iostream>
-+#include <cstring>
-
- #include <map>
- #include <set>
+++ /dev/null
-Index: gnomoradio-0.15.1/rainbow/license.cc
-===================================================================
---- gnomoradio-0.15.1.orig/rainbow/license.cc
-+++ gnomoradio-0.15.1/rainbow/license.cc
-@@ -54,7 +54,7 @@ void Rainbow::License::get_and_do (const
- }
-
- if (done) {
-- signal<void,ref_ptr<License> > sig;
-+ sigc::signal<void,ref_ptr<License> > sig;
- sig.connect(slot);
- sig(license);
- } else {
-Index: gnomoradio-0.15.1/rainbow/rdf-resource.cc
-===================================================================
---- gnomoradio-0.15.1.orig/rainbow/rdf-resource.cc
-+++ gnomoradio-0.15.1/rainbow/rdf-resource.cc
-@@ -35,7 +35,7 @@ void Rainbow::RdfResource::get_and_do (c
- resource = ref_ptr<RdfResource>(p->second);
- if (resource->downloaded) { // already downloaded
- map<Glib::ustring,xmlpp::Element*>::iterator el = resource->id_map.find(id);
-- signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
-+ sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
- sig.connect(slot);
- sig(el != resource->id_map.end() ? el->second : 0, resource);
- return;
-@@ -47,7 +47,7 @@ void Rainbow::RdfResource::get_and_do (c
- Glib::ustring host, file;
- unsigned short port;
- if (!HttpClient::parse_url(uri, host, port, file)) {
-- signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
-+ sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
- sig.connect(slot);
- sig(0, resource);
- return;
-@@ -55,14 +55,14 @@ void Rainbow::RdfResource::get_and_do (c
- }
-
- // connect mem_fun to appropriate signal
-- map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
-+ map<Glib::ustring,sigc::signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
- sig = resource->signal_map.find(id);
- if (sig != resource->signal_map.end()) {
- // found existing signal for id
- sig->second->connect(slot);
- } else {
- // need to create new signal to handle id
-- signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
-+ sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
- signal_->connect(slot);
- resource->signal_map.insert(make_pair(id, signal_));
- }
-@@ -190,7 +190,7 @@ void Rainbow::RdfResource::on_downloaded
-
- error:
- // call all signals
-- map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
-+ map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
- for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) {
- map<Glib::ustring,xmlpp::Element*>::iterator el = id_map.find(signal->first);
- signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr<RdfResource>(this));
-@@ -204,7 +204,7 @@ void Rainbow::RdfResource::on_downloaded
-
- void Rainbow::RdfResource::clear_signal_map ()
- {
-- map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
-+ map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
- for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
- delete signal->second;
- signal_map.clear();
+++ /dev/null
-Index: gnomoradio-0.15.1/roboradio/mp3/common.c
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/common.c
-+++ gnomoradio-0.15.1/roboradio/mp3/common.c
-@@ -19,7 +19,7 @@
- #include "id3.h"
- #include "id3_header.h"
-
--#include <glib/gmem.h>
-+#include <glib.h>
-
- /* max = 1728 */
- #define MAXFRAMESIZE 1792
-Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.c
-+++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
-@@ -2,8 +2,7 @@
- #include <config.h>
- #include "esd-audio.h"
-
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <pthread.h>
- #include <stdlib.h>
- #include <string.h>
-Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.h
-+++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
-@@ -1,7 +1,7 @@
- #ifndef ESD_AUDIO_H
- #define ESD_AUDIO_H
-
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- #define N_(string) string
-
-Index: gnomoradio-0.15.1/roboradio/mp3/id3.h
-===================================================================
---- gnomoradio-0.15.1.orig/roboradio/mp3/id3.h
-+++ gnomoradio-0.15.1/roboradio/mp3/id3.h
-@@ -28,7 +28,7 @@
- #ifndef ID3_H
- #define ID3_H
-
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- /*
- * Option flags to id3_open_*().
+++ /dev/null
-diff -ur gnomoradio-0.15.1.orig/roboradio/mp3/Makefile.am gnomoradio-0.15.1/roboradio/mp3/Makefile.am
---- gnomoradio-0.15.1.orig/roboradio/mp3/Makefile.am 2004-06-15 08:45:35.000000000 +0300
-+++ gnomoradio-0.15.1/roboradio/mp3/Makefile.am 2009-07-18 13:35:08.000000000 +0300
-@@ -44,7 +44,7 @@
- mpg123.h \
- tabinit.c \
- $(optimized_source)
--libroboradio_mp3_la_LIBADD = -lpthread \
-+libroboradio_mp3_la_LIBADD = -lm -lpthread \
- $(ROBORADIO_LIBS) \
- $(AO_LIBS)
-
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Finds, fetches, shares, and plays freely licensed music"
-HOMEPAGE="http://gnomoradio.org"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="vorbis"
-
-RDEPEND="dev-cpp/gtkmm:2.4
- dev-cpp/glibmm:2
- >=dev-cpp/gconfmm-2.6
- dev-cpp/libxmlpp:2.6
- dev-libs/libsigc++:2
- media-libs/libao
- vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc42.patch \
- "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-lm.patch \
- "${FILESDIR}"/${P}-glib-single-include.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable vorbis)
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>sound@gentoo.org</email>
- <name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
+++ /dev/null
-DIST bombono-dvd-1.2.2.tar.bz2 4406764 SHA256 3ffaadc803dc2526d2805629ee928800ce150cb2e6a40b6724d898c76366f68b SHA512 66982f014b6d45a9fa5a8a748dc3ed0ad79ae2d1c9e5afdf22d8db89e0f91c29fcd5639ca27ac50e50916ad37a80e536ea186e079d07efca7547fe49ab8f7d6b WHIRLPOOL 797c495a480c7b12f112809bc73e2032e846dbb57db8f3d2989d7063aa6686c3cdc8f07813bb34f0d076c6e53188931fe4b01e461d5c76bcb95557783c21cfe4
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-SCONS_MIN_VERSION="0.96.1"
-
-inherit base scons-utils toolchain-funcs flag-o-matic virtualx
-
-DESCRIPTION="GUI DVD authoring program"
-HOMEPAGE="http://www.bombono.org/"
-SRC_URI="mirror://sourceforge/bombono/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="gnome"
-
-COMMONDEPEND="
- app-i18n/enca
- app-cdr/dvd+rw-tools
- dev-cpp/gtkmm:2.4
- dev-cpp/libxmlpp:2.6
- >=dev-libs/boost-1.51
- media-libs/libdvdread
- media-sound/twolame
- media-video/dvdauthor
- virtual/cdrtools
- >=virtual/ffmpeg-9
- >=media-video/mjpegtools-1.8.0
- x11-libs/gtk+:2
-"
-RDEPEND="${COMMONDEPEND}
- gnome? ( gnome-base/gvfs )
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
-"
-
-RESTRICT=test
-# bug 419655
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.1-cflags.patch"
- "${FILESDIR}/${PN}-1.2.0-cdrtools.patch"
- "${FILESDIR}/${PN}-1.2.2-ffmpeg2.patch"
- "${FILESDIR}/${PN}-1.2.2-ffmpeg26.patch"
-)
-
-src_configure() {
- append-cppflags -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_FILESYSTEM_VERSION=3
- myesconsargs=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- CFLAGS="${CFLAGS}"
- CXXFLAGS="${CXXFLAGS}"
- DESTDIR="${D}"
- LDFLAGS="${LDFLAGS}"
- USE_EXT_BOOST=1
- PREFIX="${EPREFIX}/usr"
- )
-}
-
-src_compile() {
- nonfatal escons \
- || die "Please add ${S}/config.opts when filing bugs reports!"
-}
-
-src_test() {
- VIRTUALX_COMMAND="escons TEST=1" virtualmake
-}
-
-src_install() {
- nonfatal escons install || die "Please add ${S}/config.opts when filing bugs reports!"
-}
+++ /dev/null
-diff -ruN bombono-dvd-1.0.1.orig/SConstruct bombono-dvd-1.0.1/SConstruct
---- bombono-dvd-1.0.1.orig/SConstruct 2011-02-12 14:47:56.000000000 +0100
-+++ bombono-dvd-1.0.1/SConstruct 2011-04-24 16:59:04.149229947 +0200
-@@ -56,7 +56,7 @@
- common_warn_flags = []
- cxx_warn_flags = []
- debug_flags = ['-g', '-O0']
--release_flags = ['-O2']
-+release_flags = []
- defines = []
-
- def CalcCommonFlags():
+++ /dev/null
-diff --git a/src/mgui/author/script.h b/src/mgui/author/script.h
-index fe80307..a96fb54 100644
---- a/src/mgui/author/script.h
-+++ b/src/mgui/author/script.h
-@@ -115,9 +115,14 @@ ExitData AsyncOFCall(const std::string& cmd, const std::string& out_dir, OutputF
- // POSIX-народ бесповоротно ушел на cdrkit (genisoimage), но с Win32
- // у cdrkit хреново (только cygwin, нет собранного с growisofs с cdrkit под Win32) => потому - "вилка"
- #ifdef _WIN32
--#define MK_ISO_CMD "mkisofs"
-+ #define MK_ISO_CMD "mkisofs"
- #else
--#define MK_ISO_CMD "genisoimage"
-+ #define USE_CDRTOOLS
-+ #ifdef USE_CDRTOOLS
-+ #define MK_ISO_CMD "mkisofs"
-+ #else // !USE_CDRTOOLS
-+ #define MK_ISO_CMD "genisoimage"
-+ #endif // !USE_CDRTOOLS
- #endif
-
- #endif // #ifndef __MGUI_AUTHOR_SCRIPT_H__
+++ /dev/null
-diff -aur src/mgui/author/gb_devices.c src/mgui/author/gb_devices.c
---- src/mgui/author/gb_devices.c 2012-02-08 13:19:21.000000000 +0100
-+++ src/mgui/author/gb_devices.c 2012-04-26 14:32:30.059001909 +0200
-@@ -28,9 +28,6 @@
-
- #include "gb_devices.h"
-
--#include <glib/gthread.h>
--#include <glib/gmessages.h>
--#include <glib/ghash.h>
- /*
- #include <glib/gfileutils.h>
- */
+++ /dev/null
---- src/mgui/ffviewer.cpp.ORIG 2012-02-08 13:19:21.000000000 +0100
-+++ src/mgui/ffviewer.cpp 2013-02-24 18:11:07.565711375 +0100
-@@ -36,7 +36,13 @@
- #define AVFORMAT_54
- #endif
-
--#ifdef AVFORMAT_54
-+// разрабы libav считают себя самыми умными и потому решили
-+// закрыть простым смертным доступ к ffurl_register_protocol()
-+// (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224
-+//
-+// Поэтому: пользователи Linux остаются без предпросмотра содержимого DVD,
-+// пользователи же Windows не страдают из-за подобного политгемора
-+#if defined(AVFORMAT_54) && defined(_WIN32)
- C_LINKAGE_BEGIN
- #include <libavformat/url.h> // ffurl_register_protocol()
- C_LINKAGE_END
-@@ -1125,6 +1131,8 @@
-
- namespace DVD {
-
-+#if !defined(AVFORMAT_54) || defined(_WIN32)
-+
- struct VobCtx
- {
- int64_t curPos;
-@@ -1266,6 +1274,17 @@
- BmdDVD = 0;
- return res;
- }
-+
-+#else
-+
-+bool OpenVob(FFViewer&, VobPtr, dvd_reader_t*, std::string& err_str)
-+{
-+ err_str = "Libav: no soup for Linux users^W^W^W^W^W see https://bugzilla.libav.org/show_bug.cgi?id=224";
-+ return false;
-+}
-+
-+#endif
-+
-
- } // namespace DVD
-
+++ /dev/null
---- src/mgui/ffviewer.cpp.ORIG 2013-08-01 11:05:12.962407787 +0200
-+++ src/mgui/ffviewer.cpp 2013-08-01 11:08:26.907409685 +0200
-@@ -62,7 +62,7 @@
-
- typedef struct AVCodecTag {
- #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00)
-- enum CodecID id;
-+ enum AVCodecID id;
- #else
- int id;
- #endif
-@@ -70,14 +70,14 @@
- } AVCodecTag;
-
- #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00)
--static uint FFCodecID2Tag(CodecID codec_id)
-+static uint FFCodecID2Tag(AVCodecID codec_id)
- {
- unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id);
- extern const AVCodecTag ff_codec_bmp_tags[];
- return ff_codec_get_tag(ff_codec_bmp_tags, codec_id);
- }
- #else
--static uint FFCodecID2Tag(CodecID codec_id)
-+static uint FFCodecID2Tag(AVCodecID codec_id)
- {
- unsigned int codec_get_tag(const AVCodecTag *tags, int id);
- extern const AVCodecTag codec_bmp_tags[];
-@@ -388,7 +388,7 @@
- return (tag>>bit_begin) & 0xFF;
- }
-
--static std::string CodecID2Str(CodecID codec_id)
-+static std::string CodecID2Str(AVCodecID codec_id)
- {
- #ifdef _MSC_VER
- std::string tag_str = boost::format("%1%") % codec_id % bf::stop;
-@@ -406,7 +406,7 @@
-
- #else // CALC_FF_TAG
-
--static std::string CodecID2Str(CodecID codec_id)
-+static std::string CodecID2Str(AVCodecID codec_id)
- {
- return Int2Str(codec_id);
- }
+++ /dev/null
-Index: bombono-dvd-1.2.2/src/mgui/ffviewer.cpp
-===================================================================
---- bombono-dvd-1.2.2.orig/src/mgui/ffviewer.cpp
-+++ bombono-dvd-1.2.2/src/mgui/ffviewer.cpp
-@@ -1120,7 +1120,7 @@ static bool SeekSetTime(FFViewer& ffv, d
- bool seek_ok = TimeSeek(ffv, start_time, time);
- if( !seek_ok && CanByteSeek(ffv.iCtx) )
- // тогда переходим в начало файла
-- seek_ok = DoSeek(ffv, ffv.iCtx->data_offset, true);
-+ seek_ok = DoSeek(ffv, 0, true);
-
- // некоторое видео глючит в начале (Hellboy), из-за чего
- // последовательный доступ выполняется с перескоками -
+++ /dev/null
-From a144c07915e82607bbc76791251e8e576e17149e Mon Sep 17 00:00:00 2001
-From: Slava Dubrovskiy <dubrsl@altlinux.ru>
-Date: Thu, 6 Sep 2012 20:18:45 +0300
-Subject: [PATCH 2/2] Fix build with boost 1.51.0
-
----
- libs/boost-lib/boost/filesystem/v2/fstream.hpp | 26 +++++++++++-----------
- libs/boost-lib/boost/filesystem/v2/operations.hpp | 2 +-
- libs/boost-lib/boost/filesystem/v2/path.hpp | 24 ++++++++++----------
- libs/boost-lib/boost/filesystem/v3/path.hpp | 6 ++---
- libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp | 4 ++--
- .../boost/logging/writer/on_dedicated_thread.hpp | 2 +-
- .../samples/scenarios/ded_loger_one_filter.cpp | 2 +-
- .../samples/scenarios/ts_loger_one_filter.cpp | 2 +-
- .../logging/samples/scenarios/your_scenario.cpp | 2 +-
- .../tests/test_simple_tss/test_simple_tss.cpp | 2 +-
- .../test_ts_resource.cpp | 4 ++--
- .../logging/tests/test_tss/test_tss_objects.cpp | 2 +-
- src/mbase/project/table.cpp | 2 +-
- src/mgui/author/script.cpp | 2 +-
- src/mgui/editor/toolbar.cpp | 2 +-
- src/mgui/mux.cpp | 2 +-
- src/mgui/project/add.cpp | 6 ++---
- src/mgui/project/mconstructor.cpp | 2 +-
- src/mgui/project/serialize.cpp | 2 +-
- src/mgui/win_utils.cpp | 2 +-
- src/mlib/filesystem.cpp | 15 ++-----------
- 21 files changed, 51 insertions(+), 62 deletions(-)
-
-diff --git a/libs/boost-lib/boost/filesystem/v2/fstream.hpp b/libs/boost-lib/boost/filesystem/v2/fstream.hpp
-index bdcd485..101ed30 100644
---- a/libs/boost-lib/boost/filesystem/v2/fstream.hpp
-+++ b/libs/boost-lib/boost/filesystem/v2/fstream.hpp
-@@ -488,27 +488,27 @@ namespace boost
- std::ios_base::openmode mode )
- {
- return std::basic_filebuf<charT,traits>::open(
-- file_ph.file_string().c_str(), mode ) == 0 ? 0 : this;
-+ file_ph.string().c_str(), mode ) == 0 ? 0 : this;
- }
- # endif
-
- template <class charT, class traits>
- basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph )
- : std::basic_ifstream<charT,traits>(
-- file_ph.file_string().c_str(), std::ios_base::in ) {}
-+ file_ph.string().c_str(), std::ios_base::in ) {}
-
- template <class charT, class traits>
- basic_ifstream<charT,traits>::basic_ifstream( const path & file_ph,
- std::ios_base::openmode mode )
- : std::basic_ifstream<charT,traits>(
-- file_ph.file_string().c_str(), mode ) {}
-+ file_ph.string().c_str(), mode ) {}
-
- # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
- template <class charT, class traits>
- void basic_ifstream<charT,traits>::open( const path & file_ph )
- {
- std::basic_ifstream<charT,traits>::open(
-- file_ph.file_string().c_str(), std::ios_base::in );
-+ file_ph.string().c_str(), std::ios_base::in );
- }
-
- template <class charT, class traits>
-@@ -516,27 +516,27 @@ namespace boost
- std::ios_base::openmode mode )
- {
- std::basic_ifstream<charT,traits>::open(
-- file_ph.file_string().c_str(), mode );
-+ file_ph.string().c_str(), mode );
- }
- # endif
-
- template <class charT, class traits>
- basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph )
- : std::basic_ofstream<charT,traits>(
-- file_ph.file_string().c_str(), std::ios_base::out ) {}
-+ file_ph.string().c_str(), std::ios_base::out ) {}
-
- template <class charT, class traits>
- basic_ofstream<charT,traits>::basic_ofstream( const path & file_ph,
- std::ios_base::openmode mode )
- : std::basic_ofstream<charT,traits>(
-- file_ph.file_string().c_str(), mode ) {}
-+ file_ph.string().c_str(), mode ) {}
-
- # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
- template <class charT, class traits>
- void basic_ofstream<charT,traits>::open( const path & file_ph )
- {
- std::basic_ofstream<charT,traits>::open(
-- file_ph.file_string().c_str(), std::ios_base::out );
-+ file_ph.string().c_str(), std::ios_base::out );
- }
-
- template <class charT, class traits>
-@@ -544,14 +544,14 @@ namespace boost
- std::ios_base::openmode mode )
- {
- std::basic_ofstream<charT,traits>::open(
-- file_ph.file_string().c_str(), mode );
-+ file_ph.string().c_str(), mode );
- }
- # endif
-
- template <class charT, class traits>
- basic_fstream<charT,traits>::basic_fstream( const path & file_ph )
- : std::basic_fstream<charT,traits>(
-- file_ph.file_string().c_str(),
-+ file_ph.string().c_str(),
- std::ios_base::in|std::ios_base::out ) {}
-
-
-@@ -559,14 +559,14 @@ namespace boost
- basic_fstream<charT,traits>::basic_fstream( const path & file_ph,
- std::ios_base::openmode mode )
- : std::basic_fstream<charT,traits>(
-- file_ph.file_string().c_str(), mode ) {}
-+ file_ph.string().c_str(), mode ) {}
-
- # if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
- template <class charT, class traits>
- void basic_fstream<charT,traits>::open( const path & file_ph )
- {
- std::basic_fstream<charT,traits>::open(
-- file_ph.file_string().c_str(), std::ios_base::in|std::ios_base::out );
-+ file_ph.string().c_str(), std::ios_base::in|std::ios_base::out );
- }
-
- template <class charT, class traits>
-@@ -574,7 +574,7 @@ namespace boost
- std::ios_base::openmode mode )
- {
- std::basic_fstream<charT,traits>::open(
-- file_ph.file_string().c_str(), mode );
-+ file_ph.string().c_str(), mode );
- }
- # endif
- } // namespace filesystem2
-diff --git a/libs/boost-lib/boost/filesystem/v2/operations.hpp b/libs/boost-lib/boost/filesystem/v2/operations.hpp
-index 9bd35cd..ad08cc3 100644
---- a/libs/boost-lib/boost/filesystem/v2/operations.hpp
-+++ b/libs/boost-lib/boost/filesystem/v2/operations.hpp
-@@ -1081,7 +1081,7 @@ namespace boost
- {
- return path().filename();
- }
-- typename Path::string_type leaf() const
-+ typename Path::string_type filename().string() const
- {
- return path().filename();
- }
-diff --git a/libs/boost-lib/boost/filesystem/v2/path.hpp b/libs/boost-lib/boost/filesystem/v2/path.hpp
-index d159c37..580b635 100644
---- a/libs/boost-lib/boost/filesystem/v2/path.hpp
-+++ b/libs/boost-lib/boost/filesystem/v2/path.hpp
-@@ -232,11 +232,11 @@ namespace boost
-
- // observers
- const string_type & string() const { return m_path; }
-- const string_type file_string() const;
-- const string_type directory_string() const { return file_string(); }
-+ const string_type string() const;
-+ const string_type string() const { return string(); }
-
-- const external_string_type external_file_string() const { return Traits::to_external( *this, file_string() ); }
-- const external_string_type external_directory_string() const { return Traits::to_external( *this, directory_string() ); }
-+ const external_string_type external_file_string() const { return Traits::to_external( *this, string() ); }
-+ const external_string_type external_directory_string() const { return Traits::to_external( *this, string() ); }
-
- basic_path root_path() const;
- string_type root_name() const;
-@@ -248,7 +248,7 @@ namespace boost
- string_type extension() const;
-
- # ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-- string_type leaf() const { return filename(); }
-+ string_type filename().string() const { return filename(); }
- basic_path branch_path() const { return parent_path(); }
- bool has_leaf() const { return !m_path.empty(); }
- bool has_branch_path() const { return !parent_path().empty(); }
-@@ -309,8 +309,8 @@ namespace boost
- // are only minor differences between generic and native path grammars.
- // Private members might be quite different in other implementations,
- // particularly where there were wide differences between portable and
-- // native path formats, or between file_string() and
-- // directory_string() formats, or simply that the implementation
-+ // native path formats, or between string() and
-+ // string() formats, or simply that the implementation
- // was willing expend additional memory to achieve greater speed for
- // some operations at the expense of other operations.
-
-@@ -338,8 +338,8 @@ namespace boost
- basic_path( const string_type & str, name_check ) { operator/=( str ); }
- basic_path( const typename string_type::value_type * s, name_check )
- { operator/=( s );}
-- string_type native_file_string() const { return file_string(); }
-- string_type native_directory_string() const { return directory_string(); }
-+ string_type native_file_string() const { return string(); }
-+ string_type native_directory_string() const { return string(); }
- static bool default_name_check_writable() { return false; }
- static void default_name_check( name_check ) {}
- static name_check default_name_check() { return 0; }
-@@ -647,13 +647,13 @@ namespace boost
- if ( !path1_arg.empty() )
- {
- target += ": \"";
-- target += path1_arg.file_string();
-+ target += path1_arg.string();
- target += "\"";
- }
- if ( !path2_arg.empty() )
- {
- target += ", \"";
-- target += path2_arg.file_string();
-+ target += path2_arg.string();
- target += "\"";
- }
- }
-@@ -1294,7 +1294,7 @@ namespace boost
-
- template<class String, class Traits>
- const String
-- basic_path<String, Traits>::file_string() const
-+ basic_path<String, Traits>::string() const
- {
- # ifdef BOOST_WINDOWS_PATH
- // for Windows, use the alternate separator, and bypass extra
-diff --git a/libs/boost-lib/boost/filesystem/v3/path.hpp b/libs/boost-lib/boost/filesystem/v3/path.hpp
-index 0caa19f..fe3c975 100644
---- a/libs/boost-lib/boost/filesystem/v3/path.hpp
-+++ b/libs/boost-lib/boost/filesystem/v3/path.hpp
-@@ -389,7 +389,7 @@ namespace filesystem3
- // recently deprecated functions supplied by default
- path& normalize() { return m_normalize(); }
- path& remove_leaf() { return remove_filename(); }
-- path leaf() const { return filename(); }
-+ path filename().string() const { return filename(); }
- path branch_path() const { return parent_path(); }
- bool has_leaf() const { return !m_pathname.empty(); }
- bool has_branch_path() const { return !parent_path().empty(); }
-@@ -399,8 +399,8 @@ namespace filesystem3
- # if defined(BOOST_FILESYSTEM_DEPRECATED)
- // deprecated functions with enough signature or semantic changes that they are
- // not supplied by default
-- const std::string file_string() const { return string(); }
-- const std::string directory_string() const { return string(); }
-+ const std::string string() const { return string(); }
-+ const std::string string() const { return string(); }
- const std::string native_file_string() const { return string(); }
- const std::string native_directory_string() const { return string(); }
- const string_type external_file_string() const { return native(); }
-diff --git a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
-index 7adeaff..4fc0343 100644
---- a/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
-+++ b/libs/boost-lib/libs/filesystem/v2/src/v2_path.cpp
-@@ -107,13 +107,13 @@ namespace boost
- // if ( !path1.empty() )
- // {
- // target += ": \"";
-- // target += path1.file_string();
-+ // target += path1.string();
- // target += "\"";
- // }
- // if ( !path2.empty() )
- // {
- // target += ", \"";
-- // target += path2.file_string();
-+ // target += path2.string();
- // target += "\"";
- // }
- // }
-diff --git a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
-index 7b0aa71..a4a6f28 100644
---- a/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
-+++ b/libs/boost-logging/boost/logging/writer/on_dedicated_thread.hpp
-@@ -166,7 +166,7 @@ private:
- }
-
- boost::xtime to_wait;
-- xtime_get(&to_wait, boost::TIME_UTC);
-+ xtime_get(&to_wait, boost::TIME_UTC_);
- to_wait.sec += sleep_ms / 1000;
- to_wait.nsec += (sleep_ms % 1000) * (NANOSECONDS_PER_SECOND / 1000);
- to_wait.sec += to_wait.nsec / NANOSECONDS_PER_SECOND ;
-diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
-index 1d934da..d45beb4 100644
---- a/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
-+++ b/libs/boost-logging/lib/logging/samples/scenarios/ded_loger_one_filter.cpp
-@@ -103,7 +103,7 @@ BOOST_DEFINE_LOG(g_l, log_type)
- void do_sleep(int ms) {
- using namespace boost;
- xtime next;
-- xtime_get( &next, TIME_UTC);
-+ xtime_get( &next, TIME_UTC_);
- next.nsec += (ms % 1000) * 1000000;
-
- int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
-index 9746319..4b9f845 100644
---- a/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
-+++ b/libs/boost-logging/lib/logging/samples/scenarios/ts_loger_one_filter.cpp
-@@ -95,7 +95,7 @@ BOOST_DEFINE_LOG(g_l, log_type)
- void do_sleep(int ms) {
- using namespace boost;
- xtime next;
-- xtime_get( &next, TIME_UTC);
-+ xtime_get( &next, TIME_UTC_);
- next.nsec += (ms % 1000) * 1000000;
-
- int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
-index d447f24..f5ad955 100644
---- a/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
-+++ b/libs/boost-logging/lib/logging/samples/scenarios/your_scenario.cpp
-@@ -124,7 +124,7 @@ BOOST_DEFINE_LOG(g_log_dbg, finder::logger )
- void do_sleep(int ms) {
- using namespace boost;
- xtime next;
-- xtime_get( &next, TIME_UTC);
-+ xtime_get( &next, TIME_UTC_);
- next.nsec += (ms % 1000) * 1000000;
-
- int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
-index 627618e..205d07a 100644
---- a/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
-+++ b/libs/boost-logging/lib/logging/tests/test_simple_tss/test_simple_tss.cpp
-@@ -75,7 +75,7 @@ using namespace logging;
-
- void do_sleep(int ms) {
- xtime next;
-- xtime_get( &next, TIME_UTC);
-+ xtime_get( &next, TIME_UTC_);
- next.nsec += (ms % 1000) * 1000000;
-
- int nano_per_sec = 1000000000;
-diff --git a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
-index 0bee896..2217c12 100644
---- a/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
-+++ b/libs/boost-logging/lib/logging/tests/test_ts_resouce_with_cache/test_ts_resource.cpp
-@@ -167,7 +167,7 @@ void test_resource(int idx) {
-
- void do_sleep(int ms) {
- xtime next;
-- xtime_get( &next, TIME_UTC);
-+ xtime_get( &next, TIME_UTC_);
- next.nsec += (ms % 1000) * 1000000;
-
- int nano_per_sec = 1000000000;
-@@ -262,7 +262,7 @@ int g_run_period_secs = 200;
-
- int main()
- {
-- xtime_get( &g_start, TIME_UTC);
-+ xtime_get( &g_start, TIME_UTC_);
-
- for ( int i = 0; i < g_update_thread_count; ++i)
- thread t(&update_thread);
-diff --git a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
-index b8e1ba6..14c8281 100644
---- a/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
-+++ b/libs/boost-logging/lib/logging/tests/test_tss/test_tss_objects.cpp
-@@ -98,7 +98,7 @@ private:
-
- void do_sleep(int ms) {
- xtime next;
-- xtime_get( &next, TIME_UTC);
-+ xtime_get( &next, TIME_UTC_);
- next.nsec += (ms % 1000) * 1000000;
-
- int nano_per_sec = 1000000000;
-diff --git a/src/mbase/project/table.cpp b/src/mbase/project/table.cpp
-index 33ee15a..feb851a 100644
---- a/src/mbase/project/table.cpp
-+++ b/src/mbase/project/table.cpp
-@@ -427,7 +427,7 @@ void GetThemeList(Str::List& t_lst)
- {
- for( fs::directory_iterator itr(dir), end; itr != end; ++itr )
- if( IsFrameDir(*itr) )
-- t_lst.push_back(itr->leaf());
-+ t_lst.push_back(itr->path().filename().string());
- }
- }
-
-diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp
-index aa2b494..0c34a08 100644
---- a/src/mgui/author/script.cpp
-+++ b/src/mgui/author/script.cpp
-@@ -370,7 +370,7 @@ static std::string SrcFilename(VideoItem vi)
- static std::string PrefixCnvPath(VideoItem vi, const std::string& out_dir)
- {
- std::string dst_fname = boost::format("%1%.%2%") % GetAuthorNumber(vi)
-- % fs::path(SrcFilename(vi)).leaf() % bf::stop;
-+ % fs::path(SrcFilename(vi)).filename().string() % bf::stop;
- return AppendPath(out_dir, dst_fname);
- }
-
-diff --git a/src/mgui/editor/toolbar.cpp b/src/mgui/editor/toolbar.cpp
-index e549490..c6f15b3 100644
---- a/src/mgui/editor/toolbar.cpp
-+++ b/src/mgui/editor/toolbar.cpp
-@@ -287,7 +287,7 @@ Toolbar::Toolbar(): selTool(MakeSelectionToolImage()), txtTool(MakeTextToolLabel
- if( fs::is_directory(dir) )
- {
- boost_foreach( const fs::path& pth, dir_range(dir) )
-- o_lst.push_back(pth.filename());
-+ o_lst.push_back(pth.filename().string());
- }
- }
- std::sort(o_lst.begin(), o_lst.end(), &ByExtName);
-diff --git a/src/mgui/mux.cpp b/src/mgui/mux.cpp
-index 4b4a5fa..0864bc2 100644
---- a/src/mgui/mux.cpp
-+++ b/src/mgui/mux.cpp
-@@ -72,7 +72,7 @@ void SetDialogStrict(Gtk::Dialog& dlg, int min_wdh, int min_hgt, bool set_resiza
-
- static bool RunMuxing(const std::string& dest_path, const std::string& args)
- {
-- Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).leaf() % bf::stop);
-+ Gtk::Dialog dlg(BF_("Muxing \"%1%\"") % fs::path(dest_path).filename().string() % bf::stop);
- SetDialogStrict(dlg, 400, -1);
-
- Gtk::TextView& txt_view = NewManaged<Gtk::TextView>();
-diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp
-index db4df17..0425a9b 100644
---- a/src/mgui/project/add.cpp
-+++ b/src/mgui/project/add.cpp
-@@ -420,7 +420,7 @@ void TryAddMediaQuiet(const std::string& fname, const std::string& desc)
- static std::string StandFNameOut(const fs::path& pth)
- {
- return "<span style=\"italic\" underline=\"low\">" +
-- pth.leaf() + "</span>";
-+ pth.filename().string() + "</span>";
- }
-
- #if GTK_CHECK_VERSION(2,18,0)
-@@ -454,7 +454,7 @@ StorageItem CheckExists(const fs::path& pth, RefPtr<MediaStore> ms)
-
- void OneMediaError(const fs::path& err_pth, const std::string& desc)
- {
-- AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.leaf() % bf::stop, desc);
-+ AddMediaError(BF_("Can't add file \"%1%\".") % err_pth.filename().string() % bf::stop, desc);
- }
-
- void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
-@@ -465,7 +465,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser& brw,
- {
- const std::string fname = paths[0];
- fs::path pth(fname);
-- std::string leaf = pth.leaf();
-+ std::string leaf = pth.filename().string();
- {
- static re::pattern dvd_video_vob("(VIDEO_TS|VTS_[0-9][0-9]_[0-9]).VOB",
- re::pattern::perl|re::pattern::icase);
-diff --git a/src/mgui/project/mconstructor.cpp b/src/mgui/project/mconstructor.cpp
-index 12e2f49..7ad2546 100644
---- a/src/mgui/project/mconstructor.cpp
-+++ b/src/mgui/project/mconstructor.cpp
-@@ -961,7 +961,7 @@ void RunConstructor(const std::string& prj_file_name, bool ask_save_on_exit)
- static const fs::directory_iterator end_itr;
- for( fs::directory_iterator itr(DataDirPath("bmd-icons"));
- itr != end_itr; ++itr )
-- pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->string()));
-+ pix_lst.push_back(Gdk::Pixbuf::create_from_file(itr->path().string()));
- Gtk::Window::set_default_icon_list(pix_lst);
-
- ActionFunctor after_fnr = BuildConstructor(app, prj_file_name);
-diff --git a/src/mgui/project/serialize.cpp b/src/mgui/project/serialize.cpp
-index 12b3c3a..2340b0b 100644
---- a/src/mgui/project/serialize.cpp
-+++ b/src/mgui/project/serialize.cpp
-@@ -71,7 +71,7 @@ static std::string MakeProjectTitle(bool with_path_breakdown = false)
- return "untitled.bmd";
-
- fs::path full_path(db.GetProjectFName());
-- std::string res_str = full_path.leaf();
-+ std::string res_str = full_path.filename().string();
- if( with_path_breakdown )
- res_str += " (" + full_path.branch_path().string() + ")";
- return res_str;
-diff --git a/src/mgui/win_utils.cpp b/src/mgui/win_utils.cpp
-index 28ad9dd..175e241 100644
---- a/src/mgui/win_utils.cpp
-+++ b/src/mgui/win_utils.cpp
-@@ -418,7 +418,7 @@ bool CheckKeepOrigin(const std::string& fname)
- bool res = false;
- if( fs::exists(fname) &&
- (Gtk::RESPONSE_OK != MessageBox(BF_("A file named \"%1%\" already exists. Do you want to replace it?")
-- % fs::path(fname).leaf() % bf::stop,
-+ % fs::path(fname).filename().string() % bf::stop,
- Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL,
- _("Replacing the file overwrite its contents."),
- true)) )
-diff --git a/src/mlib/filesystem.cpp b/src/mlib/filesystem.cpp
-index bb84860..5d4f39c 100644
---- a/src/mlib/filesystem.cpp
-+++ b/src/mlib/filesystem.cpp
-@@ -47,7 +47,7 @@ const char* FindExtDot(const char* name)
-
- std::string get_basename(const fs::path& pth)
- {
-- std::string name_s = pth.leaf();
-+ std::string name_s = pth.filename().string();
- const char* name = name_s.c_str();
-
- //if( const char* dot = strstr(name, ".") )
-@@ -58,24 +58,13 @@ std::string get_basename(const fs::path& pth)
-
- std::string get_extension(const fs::path& pth)
- {
-- std::string name_s = pth.leaf();
-+ std::string name_s = pth.filename().string();
-
- if( const char* dot = FindExtDot(name_s.c_str()) )
- return std::string(dot+1);
- return std::string();
- }
-
--// глобальная установка проверки имен файлов
--class tune_boost_filesystem
--{
-- public:
-- tune_boost_filesystem()
-- {
-- // чтоб любые символы в именах файлов позволялись, для utf8
-- fs::path::default_name_check(fs::native);
-- }
--} tune_boost_filesystem_obj;
--
- namespace Project
- {
-
---
-1.7.11.7
-
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <use>
- <flag name="gnome">Use GVFS for desktop integration</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">bombono</remote-id>
- </upstream>
-</pkgmetadata>
+++ /dev/null
-DIST gip-1.7.0-1.tar.gz 69533 SHA256 c525886d90d496839b6a51e3ab771f2511abfea2fcb78cfcfe82059a4e53c6b9 SHA512 ab918fcc57d09226690ef2936bbfa5c0a9332ffe7f0bef33a7bd820bbc5af0e8220429cb5e9d10014ea66cdf49cfa96fc02afc246edea4f25647eeb2a073f984 WHIRLPOOL b4aea30722898167b8665a15a31f13e90959a2755e2950a3e0f73791af580345f76706abfa17a274ac579a07739f0bbf01adc976b8b178dca75354c7e2eae073
-DIST gip_1.7.0-1-3.debian.tar.gz 6689 SHA256 7f9e7818ffb726347f69cdc6d86a45d7c07186f4f21bf81bb08c04ff2511e494 SHA512 d17a02900f7dd9fbe3113977c86d52ff94fabc988406bad0ca7f148d87e1185f5f679a1539726227569534b4b810290954e42fa6df0586c84ddb074053196580 WHIRLPOOL acc967221c9a388f7539216a32ba82f1702c36b890637a46a6c360e15201732f946f4afeb0ec8e38e457657d944f315c26925c86e196da39802c13624ad2d6a0
+++ /dev/null
- installer/build_files.sh | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/installer/build_files.sh b/installer/build_files.sh
-index 8d469b0..bc653cf 100755
---- a/installer/build_files.sh
-+++ b/installer/build_files.sh
-@@ -27,7 +27,7 @@ compile_file() {
- # Compile.
- echo Compiling: $FILE...
- set -x
-- g++ -fPIC $CFLAGS -c $FILE -o $OBJECTFILE
-+ g++ -fPIC $CFLAGS $CXXFLAGS -c $FILE -o $OBJECTFILE
- ERR="$?"
- set +x
- if [ "$ERR" -ne "0" ]; then
-@@ -122,14 +122,14 @@ fi
- if [ "$SHARED" = "" ]; then
- # Link as an executable.
- set -x
-- g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
-+ g++ $CFLAGS $CXXFLAGS $LDFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
- ERR="$?"
- set +x
- else
- # Link as a shared library.
- SHAREDNAME=`echo $OUTFILE | sed 's/\..*//'`
- set -x
-- g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
-+ g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS $CXXFLAGS $LDFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS
- ERR="$?"
- set +x
- fi
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_PV="$(replace_version_separator 3 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A nice GNOME GUI for making IP address based calculations"
-HOMEPAGE="https://code.google.com/p/gip/"
-SRC_URI="
- https://gip.googlecode.com/files/${MY_P}.tar.gz
- mirror://debian/pool/main/g/${PN}/${PN}_${MY_PV}-3.debian.tar.gz"
-#http://ftp.de.debian.org/debian/pool/main/g/gip/gip_1.7.0-1-3.debian.tar.gz
-#http://dl.debain.org/gip/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-cpp/gtkmm:2.4
- dev-libs/glib:2
- dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch \
- "${WORKDIR}"/debian/patches/*.diff \
- "${FILESDIR}"/${P}-asneeded.patch
-
- sed \
- -e "s:g++:$(tc-getCXX):g" \
- -i installer/build_files.sh
-
-# sed \
-# -e 's:CFLAGS=":CFLAGS+=" :g' \
-# -i build.sh || die
-
-# "${FILESDIR}"/${PN}-1.6.1.1-asneeded.patch
-
-# "${FILESDIR}/${P}-libsigcpp.patch" \
-# sed -i -e 's@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@g' build.sh
-# sed -i -e 's@INST_PIXMAPDIR=\"/usr/lib/$EXECUTABLE\"@INST_PIXMAPDIR=\"$INST_PREFIX/lib/$EXECUTABLE\"@g' build.sh
-# sed -i -e 's@INST_DOCDIR=\"$INST_PREFIX/doc/$EXECUTABLE\"@INST_DOCDIR=\"$INST_PREFIX/share/doc/'${PF}'\"@g' build.sh
-}
-
-src_compile() {
- # Crazy build system...
- export CXXFLAGS="${CXXFLAGS}"
- ./build.sh --prefix "${D}/usr" || die "./build failed"
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog README
- # Crazy build system...
- ./build.sh --install --prefix "${D}/usr" || die "./build --install failed"
- make_desktop_entry gip "GIP IP Address Calculator" gnome-calc3 Network
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <longdescription lang="en">
- Gip is a nice GNOME GUI for making IP address based calculations. For
- example, it can display IP addresses in binary format. Also, it is
- possible to calculate subnets.
- </longdescription>
- <longdescription lang="ja">
- Gip は IP アドレス関係の計算をするのに便利な GNOME GUI のプログラムです。例えば、2進法で表現された IP アドレスを10進法にします。サブネットを計算することもできます。
- </longdescription>
-</pkgmetadata>
+++ /dev/null
-DIST linuxdcpp-1.0.3.tar.bz2 289891 SHA256 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71 SHA512 c0eb38b89b6a47a4a29ade90b3813e302b8c4dd8bea39770fce4e232ff17035ba355b36feb6b69195ba7c8448a69943ee61722e335ad514f426238fb8a089e79 WHIRLPOOL e6feb69c38020a13b2d37cc7dd51614946e2ba2642d7173e72d9d50af37cc510b8ac0f983c1bf68feab3e2d82027471ab8fc3beacbe96b680c87c889cdd88034
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-# TODO: This needs to use the escons eclass.
-inherit eutils multiprocessing
-
-DESCRIPTION="Direct connect client, looks and works like famous DC++"
-HOMEPAGE="https://launchpad.net/linuxdcpp"
-SRC_URI="https://launchpad.net/linuxdcpp/1.0/${PV}/+download/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=gnome-base/libglade-2.4:2.0
- >=x11-libs/gtk+-2.6:2
- app-arch/bzip2
- dev-libs/openssl"
-DEPEND="${RDEPEND}
- media-libs/fontconfig
- >=dev-util/scons-0.96
- virtual/pkgconfig"
-
-src_prepare() {
- # prevent scons installation of *txt files to wrong directory
- sed -i 's/.*source = text_files.*//' SConstruct
-}
-
-src_compile() {
- local myconf=""
- use debug && myconf="${myconf} debug=1"
-
- scons ${myconf} -j$(makeopts_jobs) CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
- # linuxdcpp does not install docs according to gentoos naming scheme, so do it by hand
- dodoc Readme.txt Changelog.txt Credits.txt
- rm "${S}"/*.txt
-
- scons install PREFIX="/usr" FAKE_ROOT="${D}" || die "scons install failed"
-
- doicon pixmaps/${PN}.png
- make_desktop_entry ${PN} ${PN}
-}
-
-pkg_postinst() {
- elog
- elog "After adding first directory to shares you might need to restart linuxdcpp."
- elog
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
- <remote-id type="launchpad">linuxdcpp</remote-id>
- </upstream>
-</pkgmetadata>
# Removal in a month.
app-admin/showconsole
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Fails to build, bug #348418
-# Removal in a month.
-dev-ada/gtkada
-
-# Pacho Ramos <pacho@gentoo.org> (01 Jan 2016)
-# Upstream died long time ago, replaced by eiskaltdcpp
-# bug #364057 . Removal in a month.
-net-p2p/linuxdcpp
-
-# Patrice Clement <monsieurp@gentoo.org> (01 Jan 2016)
-# Project dead: upstream deprecated it a while ago.
-# Masked for removal in 30 days. See bug #429444.
-dev-python/pyltxml
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, bug #567092
-# Removal in a month.
-net-misc/gip
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, bug #568796
-# Removal in a month.
-media-sound/gnomoradio
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, bug #568796
-# Removal in a month.
-app-office/passepartout
-
-# Pacho Ramos <pacho@gentoo.org> (31 Dec 2015)
-# Upstream dead, doesn't compile with libsigc++-2.6, multiple bugs
-# with current ffmpeg versions, bug #568796
-# Removal in a month.
-media-video/bombono-dvd
-
# Victor Ostorga <vostorga@gentoo.org> (30 Dec 2015)
# Mask this liferea version because upstream released it broken
=net-news/liferea-1.10.17
# #370021, #478614, #513964
sci-libs/libbufr
-# Mikle Kolyada <zlogene@gentoo.org> (26 Dec 2015)
-# Dead upstream (last activity in 2003)
-# Nothing in the tree depends on it
-# Masked for removal
-dev-perl/SpeedyCGI
-
# Manuel Rüger <mrueg@rueg.eu> (24 Dec 2015)
# Effectively unmaintained, multiple bugs
# Bug 288611,358013,413987,468186,480854,528750,548480,566226
# Ebuild uninstallable #557090
=app-crypt/gkeys-0.1-r1
-# Brian Evans <grknight@gentoo.org> (17 Dec 2015)
-# "The drizzle project is long dead, it should be removed,
-# along with dev-php/pecl-drizzle", by grknight
-# in Bug #501060
-# Try 2 acked by idella4
-# Masked for removal in 30 days.
-dev-db/drizzle
-dev-php/pecl-drizzle
-
# Fabian Groffen <grobian@gentoo.org> (11 Dec 2015)
# Release candidates for Exim 4.87
=mail-mta/exim-4.87_rc2
projects / gentoo.git / commitdiff