Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (2b1bf450e52dcacb3dbebfa26b858f16c1156a32)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (2b1bf450e52dcacb3dbebfa26b858f16c1156a32)
  • Date: Sat, 31 Mar 2007 05:39:42 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

x11-toolkits/lesstif/DETAILS | 1 +
x11-toolkits/lesstif/HISTORY | 8 ++++++++
x11-toolkits/lesstif/PRE_BUILD | 6 ++++++
x11-toolkits/lesstif/c++fix.patch | 20 ++++++++++++++++++++
x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch | 10 +++++-----
x11-toolkits/lesstif/scroll.patch | 15 +++++++++++++++
6 files changed, 55 insertions(+), 5 deletions(-)

New commits:
commit 2b1bf450e52dcacb3dbebfa26b858f16c1156a32
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

lesstif: Added patch to fix problem with c++ that prevented xpf from
compiling. Noticed that security patch was removed, but fix was never in
code. Added fix for inverse scrolling. SECURITY_PATCH++

diff --git a/x11-toolkits/lesstif/DETAILS b/x11-toolkits/lesstif/DETAILS
index 5ea4293..fec0ac6 100755
--- a/x11-toolkits/lesstif/DETAILS
+++ b/x11-toolkits/lesstif/DETAILS
@@ -5,6 +5,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=LGPL
+ SECURITY_PATCH=1
WEB_SITE=http://www.lesstif.org
ENTERED=20011019
SHORT="Lesstif is an LGPL'd implementation of the OSF/Motif GUI
X11 toolkit."
diff --git a/x11-toolkits/lesstif/HISTORY b/x11-toolkits/lesstif/HISTORY
index 3f63254..b4ceef4 100644
--- a/x11-toolkits/lesstif/HISTORY
+++ b/x11-toolkits/lesstif/HISTORY
@@ -1,3 +1,11 @@
+2007-03-31 George Sherwood <george AT beernabeer.com
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: Added for three patches
+ * lesstif-CAN-2005-0605.patch: This was not fixed in 0.95.0 as
+ as far as I can tell.
+ * c++fix.patch: xpdf will not build against lesstiff without this
+ * scroll.patch: had inverse scrolling
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/x11-toolkits/lesstif/PRE_BUILD b/x11-toolkits/lesstif/PRE_BUILD
new file mode 100755
index 0000000..cf8bf4f
--- /dev/null
+++ b/x11-toolkits/lesstif/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/c++fix.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/scroll.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/lesstif-CAN-2005-0605.patch
+
diff --git a/x11-toolkits/lesstif/c++fix.patch
b/x11-toolkits/lesstif/c++fix.patch
new file mode 100644
index 0000000..0bf17bd
--- /dev/null
+++ b/x11-toolkits/lesstif/c++fix.patch
@@ -0,0 +1,20 @@
+--- include/Motif-2.1/Xm/VendorSP.h.BAD 2006-08-30 11:00:30.000000000
-0500
++++ include/Motif-2.1/Xm/VendorSP.h 2006-08-30
+11:00:47.000000000 -0500
+@@ -28,12 +28,13 @@
+
+ #include <Xm/XmP.h>
+ #include <Xm/VendorS.h>
+-#include <X11/ShellP.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
++#include <X11/ShellP.h>
++
+ XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
+ Cardinal numResources,
+ WidgetClass filterClass,
+
+
diff --git a/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
b/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
index 0b38bea..cc1ee63 100644
--- a/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
+++ b/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
@@ -1,5 +1,5 @@
---- lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c.orig 2005-03-02 17:00:16.415070960
+0100
-+++ lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c 2005-03-02 17:01:38.949709879
+0100
+--- lib/Xm-2.1/Xpmscan.c.BAD 2006-08-29 14:34:31.000000000 -0500
++++ lib/Xm-2.1/Xpmscan.c 2006-08-29 14:36:05.000000000 -0500
@@ -672,8 +672,8 @@
char *dst;
unsigned int *iptr;
@@ -16,13 +16,13 @@
offset = image->xoffset;

+ if (image->bitmap_unit < 0)
-+ return (XpmNoMemory);
++ return (XpmNoMemory);
+
if ((image->bits_per_pixel | image->depth) == 1) {
ibu = image->bitmap_unit;
for (y = 0; y < height; y++)
---- lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844
+0100
-+++ lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c 2005-03-02 17:02:35.183562480
+0100
+--- lib/Xm-2.1/Xpmcreate.c.BAD 2006-08-29 14:36:13.000000000 -0500
++++ lib/Xm-2.1/Xpmcreate.c 2006-08-29 14:36:36.000000000 -0500
@@ -1265,10 +1265,10 @@
register char *src;
register char *dst;
diff --git a/x11-toolkits/lesstif/scroll.patch
b/x11-toolkits/lesstif/scroll.patch
new file mode 100644
index 0000000..75db07d
--- /dev/null
+++ b/x11-toolkits/lesstif/scroll.patch
@@ -0,0 +1,15 @@
+--- lib/Xm-2.1/Transltns.old 2006-12-31 18:28:29.000000000 +0200
++++ lib/Xm-2.1/Transltns.c 2006-12-31
+18:29:12.000000000 +0200
+@@ -670,8 +670,8 @@
+ /* Scroll wheel */
+ "\nShift<Btn4Down>: page-left()"
+ "\nShift<Btn5Down>: page-right()"
+- "\n<Btn5Down>: scroll-one-line-up()"
+- "\n<Btn4Down>: scroll-one-line-down()"
++ "\n<Btn4Down>: scroll-one-line-up()"
++ "\n<Btn5Down>: scroll-one-line-down()"
+ #endif
+ ;
+
+




Archive powered by MHonArc 2.6.24.

Top of Page