Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.20 grimoire by Eric Sandall (775f4dce31937beb79a9b52f6bcc21fd3ce4ce50)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.20 grimoire by Eric Sandall (775f4dce31937beb79a9b52f6bcc21fd3ce4ce50)
  • Date: Tue, 29 Apr 2008 15:11:11 -0500

GIT changes to stable-0.20 grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ftp/amule/HISTORY | 3
ftp/amule/PRE_BUILD | 2
ftp/amule/aMule-wx.patch | 156
++++++++++++++++++++++++++++++++++++++++
printer/ijs/DEPENDS | 2
printer/ijs/HISTORY | 4 +
printer/ijs/ijs-0.35.tar.gz.sig |binary
x11/rss-glx/HISTORY | 4 +
x11/rss-glx/PRE_BUILD | 4 +
x11/rss-glx/gcc43.patch | 11 ++
x11/rss-glx/imagemagick.patch | 10 ++
10 files changed, 195 insertions(+), 1 deletion(-)

New commits:
commit 775f4dce31937beb79a9b52f6bcc21fd3ce4ce50
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rss-glx: fixed #14475 and compilation
(cherry picked from commit 8cbb928cefefd3ca34c57d9076180823d0418bd0)

commit 8b7dd00f3ba6f9b582869314fee17816738115c9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

amule: fixed #14473
(cherry picked from commit 3a8a4c4d26d34aee5b2e8087c76e6d3857e50944)

commit e31ac004a0bcedf1071358ceebf76a67cf6651c9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ijs: sig was not cross-certified #14355
(cherry picked from commit 718bcfd520b04ee542861d2dcdbf366eecd4f53a)

commit 8d17bd97401f0f3f03fbe925b94c51867979ef22
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ijs: changed hpijs to hplip #14356
(cherry picked from commit 06033cbffcd0cb2eb6a22bf7660c6240d880c191)

diff --git a/ftp/amule/HISTORY b/ftp/amule/HISTORY
index 62fd7a3..2e86a36 100644
--- a/ftp/amule/HISTORY
+++ b/ftp/amule/HISTORY
@@ -1,3 +1,6 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, aMule-wx.patch: added to fix #14473
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/ftp/amule/PRE_BUILD b/ftp/amule/PRE_BUILD
new file mode 100755
index 0000000..ef00667
--- /dev/null
+++ b/ftp/amule/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 -d "$SOURCE_DIRECTORY" < $SCRIPT_DIRECTORY/aMule-wx.patch
diff --git a/ftp/amule/aMule-wx.patch b/ftp/amule/aMule-wx.patch
new file mode 100644
index 0000000..8148d35
--- /dev/null
+++ b/ftp/amule/aMule-wx.patch
@@ -0,0 +1,156 @@
+diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp
aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
+--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16
13:09:29.000000000 +0100
++++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17
20:20:47.151203000 +0100
+@@ -297,7 +297,7 @@
+ m_validateButton =
+ new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate"
) ) );
+ m_cancelButton =
+- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) )
);
++ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
+
+ m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
+ m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
+@@ -321,7 +321,6 @@
+ EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
+ EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON,
WxCasPrefs::OnAutoStatImgBrowseButton )
+ EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
+-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in
wxDialog
+ EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
+ EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
+ END_EVENT_TABLE ()
+--- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250
+0100
++++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250
+0100
+@@ -101,8 +101,7 @@
+ ID_AUTOSTATIMG_COMBO,
+ ID_AUTOSTATIMG_BROWSE_BUTTON,
+ ID_FTP_UPDATE_CHECK,
+- ID_VALIDATE_BUTTON,
+- ID_CANCEL_BUTTON
++ ID_VALIDATE_BUTTON
+ };
+
+ protected:
+--- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100
++++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100
+@@ -24,7 +24,6 @@
+
+ #include <wx/mstream.h>
+ #include <wx/gifdecod.h>
+-#include <wx/window.h>
+ #include <wx/dcbuffer.h>
+
+ #include "MuleGifCtrl.h"
+@@ -35,6 +34,50 @@
+ EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
+ END_EVENT_TABLE()
+
++#if wxCHECK_VERSION(2, 7, 1)
++// Wrapper that emulates old wxGIFDecoder API
++
++class MuleGIFDecoder : public wxGIFDecoder {
++public:
++ MuleGIFDecoder(wxInputStream* stream, bool dummy) {
++ m_stream = stream;
++ dummy = dummy; // Unused.
++ m_nframe = 0;
++ }
++
++ ~MuleGIFDecoder() { /* don't delete the stream! */ }
++
++ wxGIFErrorCode ReadGIF() {
++ return LoadGIF(*m_stream);
++ }
++
++ void GoFirstFrame() { m_nframe = 0; }
++ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ?
m_nframe++ : m_nframe = 0; }
++ void GoLastFrame() { m_nframe = GetFrameCount(); }
++
++ void ConvertToImage(wxImage* image) {
wxGIFDecoder::ConvertToImage(m_nframe, image); }
++
++ size_t GetLogicalScreenWidth() { return
GetAnimationSize().GetWidth(); }
++ size_t GetLogicalScreenHeight() { return
GetAnimationSize().GetHeight(); }
++
++ size_t GetLeft() { return 0; }
++ size_t GetTop() { return 0; }
++
++ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
++
++private:
++ uint32_t m_nframe;
++ wxInputStream* m_stream;
++};
++
++#else
++class MuleGIFDecoder : public wxGIFDecoder {
++public:
++ MuleGIFDecoder(wxInputStream* stream, bool flag) :
wxGIFDecoder(stream,flag) {};
++};
++#endif
++
++
+
+ MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint&
pos,
+ const wxSize& size, long style, const
wxValidator& validator,
+@@ -66,7 +109,7 @@
+ }
+
+ wxMemoryInputStream stream(data, size);
+- m_decoder = new wxGIFDecoder(&stream, TRUE);
++ m_decoder = new MuleGIFDecoder(&stream, TRUE);
+ if ( m_decoder->ReadGIF() != wxGIF_OK ) {
+ delete m_decoder;
+ m_decoder = NULL;
+@@ -137,3 +180,4 @@
+ dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y +
m_decoder->GetTop(), true);
+ }
+
++// File_checked_for_headers
+--- aMule/src/MuleGifCtrl.h 2006-01-01 06:17:25.000000000 +0100
++++ aMule/src/MuleGifCtrl.h 2006-11-18 05:01:22.000000000 +0100
+@@ -27,11 +27,10 @@
+
+ #include <wx/control.h>
+ #include <wx/timer.h>
+-#include <wx/bitmap.h>
+
+ const int GIFTIMERID = 271283;
+
+-class wxGIFDecoder;
++class MuleGIFDecoder;
+ class wxBitmap;
+
+ /**
+@@ -121,7 +120,7 @@
+ void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
+
+ //! A pointer to the current gif-animation.
+- wxGIFDecoder* m_decoder;
++ MuleGIFDecoder* m_decoder;
+ //! Timer used for the delay between each frame.
+ wxTimer m_timer;
+ //! Current frame.
+@@ -133,3 +132,4 @@
+
+ #endif
+
++// File_checked_for_headers
+--- aMule-2.1.3/src/MuleTextCtrl.cpp~ 2006-12-17 20:55:37.157820250 +0100
++++ aMule-2.1.3/src/MuleTextCtrl.cpp 2006-12-17 20:56:21.328580750 +0100
+@@ -26,6 +26,7 @@
+ #include <wx/menu.h>
+ #include <wx/intl.h>
+ #include <wx/clipbrd.h>
++#include <wx/dataobj.h>
+
+ /**
+ * These are the IDs used to identify the different menu-items.
+--- amule/src/amule.cpp~ 2006-12-17 21:53:26.474639000 +0100
++++ amule/src/amule.cpp 2006-12-17 21:55:40.307003000 +0100
+@@ -96,6 +96,7 @@
+ #include <CoreFoundation/CFBundle.h>
+ #include <wx/mac/corefoundation/cfstring.h>
+ #endif
++ #include <wx/msgdlg.h>
+ #endif
+
+
diff --git a/printer/ijs/DEPENDS b/printer/ijs/DEPENDS
index d8769ab..93357b5 100755
--- a/printer/ijs/DEPENDS
+++ b/printer/ijs/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "hpijs" "" "" "for the hpijs printer drivers"
&&
+optional_depends "hplip" "" "" "for the hplip printer drivers"
&&
optional_depends "gutenprint" "" "" "for the gutenprint printer drivers"

diff --git a/printer/ijs/HISTORY b/printer/ijs/HISTORY
index 04cb0b6..c4144d6 100644
--- a/printer/ijs/HISTORY
+++ b/printer/ijs/HISTORY
@@ -1,3 +1,7 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * ijs-0.35.tar.gz.asc: regenerated for #14355
+ * DEPENDS: changed hpijs to hplip #14356
+
2007-06-03 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix minor typo, bug #13800

diff --git a/printer/ijs/ijs-0.35.tar.gz.sig b/printer/ijs/ijs-0.35.tar.gz.sig
index 61bb335..ec04aa0 100644
Binary files a/printer/ijs/ijs-0.35.tar.gz.sig and
b/printer/ijs/ijs-0.35.tar.gz.sig differ
diff --git a/x11/rss-glx/HISTORY b/x11/rss-glx/HISTORY
index a4825d6..3ad5ec9 100644
--- a/x11/rss-glx/HISTORY
+++ b/x11/rss-glx/HISTORY
@@ -1,3 +1,7 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, gcc43.patch: ported to gcc43
+ * imagemagick.patch: added patch from gentoo for #14475
+
2008-01-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added imagemagick #14196

diff --git a/x11/rss-glx/PRE_BUILD b/x11/rss-glx/PRE_BUILD
new file mode 100755
index 0000000..a83b47f
--- /dev/null
+++ b/x11/rss-glx/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < $SPELL_DIRECTORY/imagemagick.patch &&
+patch -p4 < $SPELL_DIRECTORY/gcc43.patch
diff --git a/x11/rss-glx/gcc43.patch b/x11/rss-glx/gcc43.patch
new file mode 100644
index 0000000..0db3571
--- /dev/null
+++ b/x11/rss-glx/gcc43.patch
@@ -0,0 +1,11 @@
+--- /usr/src/rss-glx_0.8.1/reallyslick/Implicit/impSurface.cpp.orig
2008-04-28 17:45:14.000000000 +0200
++++ /usr/src/rss-glx_0.8.1/reallyslick/Implicit/impSurface.cpp 2008-04-28
17:45:52.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <Implicit/impSurface.h>
+ #include <math.h>
+ #include <iostream>
++#include <cstring>
+
+
+
+
diff --git a/x11/rss-glx/imagemagick.patch b/x11/rss-glx/imagemagick.patch
new file mode 100644
index 0000000..772f55d
--- /dev/null
+++ b/x11/rss-glx/imagemagick.patch
@@ -0,0 +1,10 @@
+--- rss-glx_0.8.1/other_src/Makefile.in 2006-02-25 21:14:56.000000000
+0000
++++ rss-glx_0.8.1.new/other_src/Makefile.in 2008-03-27 16:00:53.000000000
+0000
+@@ -232,6 +232,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
++AM_CFLAGS = $(Wand_CFLAGS)
+ biof_SOURCES = driver.c biof.c
+ busyspheres_SOURCES = driver.c busyspheres.c
+ matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c



  • [SM-Commit] GIT changes to stable-0.20 grimoire by Eric Sandall (775f4dce31937beb79a9b52f6bcc21fd3ce4ce50), Eric Sandall, 04/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page