Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (0967771c9e6eb6be9bded753c3867c8e86d2bf5a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (0967771c9e6eb6be9bded753c3867c8e86d2bf5a)
  • Date: Wed, 15 Feb 2012 06:50:28 -0600

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

smgl/upstart/HISTORY | 3
windowmanagers/windowmaker/BUILD | 9
windowmanagers/windowmaker/DETAILS | 11
windowmanagers/windowmaker/HISTORY | 4
windowmanagers/windowmaker/PRE_BUILD | 3
windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch | 23 -
windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch | 131
----------
7 files changed, 12 insertions(+), 172 deletions(-)

New commits:
commit 8eaf1e6ed0aa39bd2ddd75d336f2c6f754e5c68f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

windowmaker: version 0.95.2 and removed obsolete patches

commit a2adcaf9dc5344daaf662f18a832eaa67c6cfd80
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

upstart: re-added a HISTORY entry that got lost

diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 6badb02..c525689 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -3,6 +3,9 @@
* PRE_BUILD: fixed removal of sysv-compat jobs
* upstart.gpg: added another key they use for releases

+2011-10-14 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: fixed long description wrap (scripted)
+
2011-11-10 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 1.2, long description <80 col
switched to upstream gpg checking
diff --git a/windowmanagers/windowmaker/BUILD
b/windowmanagers/windowmaker/BUILD
deleted file mode 100755
index a6a90d1..0000000
--- a/windowmanagers/windowmaker/BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == alpha ]] || [[ "${SMGL_COMPAT_ARGS[1]}"
!= x86_64 ]]; then
- message "we are on alpha or x66_64, letting it PIC" &&
- default_build
-else
- message "disabling PIC on non-alpha or non-x86_64 arch" &&
- OPTS="--without-pic ${OPTS}" &&
- disable_pic force &&
- default_build
-fi
diff --git a/windowmanagers/windowmaker/DETAILS
b/windowmanagers/windowmaker/DETAILS
index 2078523..c911a97 100755
--- a/windowmanagers/windowmaker/DETAILS
+++ b/windowmanagers/windowmaker/DETAILS
@@ -1,10 +1,9 @@
SPELL=windowmaker
- VERSION=current
- SOURCE=WindowMaker-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker
-# SOURCE_URL[0]=http://hg.windowmaker.info/wmaker/archive/tip.tar.bz2
- SOURCE_URL[0]=http://bfr.kicks-ass.net/smgl/WindowMaker-current.tar.bz2
-
SOURCE_HASH=sha512:dfdefa349d3afe39459b2d62c185a9073088ce527b99ed094bf8b6cdcb6b5a072a6010b9a53689a507d7830d873868762b0a860a822c44d74d256ccaf1c1e315
+ VERSION=0.95.2
+ SOURCE=WindowMaker-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker-${VERSION}
+
SOURCE_URL[0]=http://windowmaker.org/pub/source/release/WindowMaker-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:91899b36573d4a174ed1c9516df2f4ada03a91f0d50a501053c970ec818874b7597c6db9a004189ce97d66345d0bee06d951f16c808203e6be13075bd8bf02ae
WEB_SITE=http://www.windowmaker.info
LICENSE[0]=GPL
LICENSE[1]=http://windowmaker.info/disclaimer.html
diff --git a/windowmanagers/windowmaker/HISTORY
b/windowmanagers/windowmaker/HISTORY
index c4350bf..ad6b740 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,7 @@
+2012-02-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.95.2
+ * PRE_BUILD, BUILD, INSTALL, windowmaker*.patch: removed obsolete
patches.
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/windowmanagers/windowmaker/PRE_BUILD
b/windowmanagers/windowmaker/PRE_BUILD
deleted file mode 100755
index 33efff7..0000000
--- a/windowmanagers/windowmaker/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-./autogen.sh
diff --git a/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
b/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
deleted file mode 100644
index e3b50ac..0000000
--- a/windowmanagers/windowmaker/windowmaker-0.92.0-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac.orig 2007-08-27 00:51:31.000000000 +0200
-+++ configure.ac 2007-08-27 00:52:14.000000000 +0200
-@@ -197,7 +197,7 @@
-
- AC_CACHE_CHECK(whether gcc supports x86 inline asm,
- ac_cv_c_inline_asm,
-- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax,
%%ebx\n"::
-+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax,
%%ebx\n\t pushal\n\t popal"::
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
- "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m"
(x));}],
- ac_cv_c_inline_asm=yes,
-@@ -840,11 +840,6 @@
- else
- gnustepdir=$appspath
-
-- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
-- gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e
"s|^${prefix}|prefix|"`
-- gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'`
-- fi
--
- wprefs_base_dir=$gnustepdir/Applications
- wprefs_datadir=$wprefs_base_dir/WPrefs.app
- wprefs_bindir=$wprefs_base_dir/WPrefs.app
diff --git a/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
b/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
deleted file mode 100644
index 4312435..0000000
--- a/windowmanagers/windowmaker/windowmaker-0.92.0-gcc41.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- NEW FILE windowmaker-gcc4-x86_64.patch ---
---- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000
+0100
-+++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-22 21:07:57.000000000
+0200
-@@ -98,15 +98,23 @@
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-+
- short *tmp_err;
- short *tmp_nerr;
- int x;
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- // pack dr, dg and db into mm6
- "movl %7, %%eax \n\t"
-@@ -290,7 +298,7 @@
-
- ".Enda: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -309,17 +317,18 @@
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x) // %26
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-
-@@ -342,8 +351,15 @@
- int height,
- int line_offset)
- {
-- long long rrggbbaa;
-- long long pixel;
-+ union {
-+ long long rrggbbaa;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } rrggbbaa;
-+
-+ union {
-+ long long pixel;
-+ struct {short int rr, gg, bb, aa;} words;
-+ } pixel;
-
- short *tmp_err;
- short *tmp_nerr;
-@@ -354,7 +370,7 @@
-
- asm volatile
- (
-- "pushal \n\t"
-+ "pushl %%ebx \n\t"
-
- "movl %13, %%eax \n\t" // eax = width
- "movl %%eax, %%ebx \n\t"
-@@ -424,7 +440,7 @@
-
- ".Endc: \n\t" // THE END
- "emms \n\t"
-- "popal \n\t"
-+ "popl %%ebx \n\t"
- :
- :
- "m" (image), // %0
-@@ -443,19 +459,20 @@
- "m" (width), // %13
- "m" (height), // %14
- "m" (line_offset), // %15
-- "m" (rrggbbaa), // %16 (access to rr)
-- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
-- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
-- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
-- "m" (pixel), // %20 (access to pixel.r)
-- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
-- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
-- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
-+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr)
-+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
-+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
-+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
-+ "m" (pixel.pixel), // %20 (access to pixel.r)
-+ "m" (pixel.words.gg), // %21 (access to pixel.g)
-+ "m" (pixel.words.bb), // %22 (access to pixel.b)
-+ "m" (pixel.words.aa), // %23 (access to pixel.a)
- "m" (tmp_err), // %24
- "m" (tmp_nerr), // %25
- "m" (x), // %26
- "m" (w1), // %27
- "m" (w2) // %28
-+ : "eax", "ecx", "edx", "esi", "edi"
- );
- }
-



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (0967771c9e6eb6be9bded753c3867c8e86d2bf5a), Arjan Bouter, 02/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page