Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ab671093bfa90f6fffb48445f9d45bd7ab775a57)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ab671093bfa90f6fffb48445f9d45bd7ab775a57)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ab671093bfa90f6fffb48445f9d45bd7ab775a57)
  • Date: Wed, 6 May 2015 03:39:17 -0500
GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 13 +
antivirus/clamav/DETAILS | 4
antivirus/clamav/HISTORY | 7
antivirus/clamav/vendor_clamav.gpg |binary
crypto/libgpg-error/DETAILS | 2
crypto/libgpg-error/HISTORY | 3
devel/llvm/HISTORY | 5
devel/llvm/PRE_BUILD | 4
devel/llvm/lldb-shared-libs.patch | 94
++++++++
glselect.function | 109
----------
graphics-libs/glu/DETAILS | 17 -
graphics-libs/glu/HISTORY | 4
graphics-libs/glu/PREPARE | 2
graphics-libs/glu/PRE_BUILD | 5
graphics-libs/mesalib/DEPENDS | 1
graphics-libs/mesalib/FINAL | 1
graphics-libs/mesalib/HISTORY | 4
kernels/linux/HISTORY | 3
kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42 | 5
libs/openscenegraph/DEPENDS | 1
libs/openscenegraph/HISTORY | 3
perl-cpan/email-mime-modifier/BUILD | 2
perl-cpan/email-mime-modifier/CONFLICTS | 1
perl-cpan/email-mime-modifier/DEPENDS | 8
perl-cpan/email-mime-modifier/DETAILS | 6
perl-cpan/email-mime-modifier/HISTORY | 5
perl-cpan/email-mime-modifier/INSTALL | 1
perl-cpan/email-mime-modifier/PRE_BUILD | 1
perl-cpan/email-mime-modifier/UP_TRIGGERS | 2
python-pypi/python-pgpdump/DEPENDS | 2
python-pypi/python-pgpdump/DETAILS | 28 ++
python-pypi/python-pgpdump/HISTORY | 2
python-pypi/requests/DETAILS | 4
python-pypi/requests/HISTORY | 3
shell-term-fm/pdksh/HISTORY | 3
shell-term-fm/pdksh/PRE_BUILD | 4
smgl/lsb-release/DETAILS | 1
smgl/lsb-release/HISTORY | 5
smgl/lsb-release/INSTALL | 1
video/mpv/DEPENDS | 2
video/mpv/HISTORY | 3
xorg-xserver/xorg-server/DEPENDS | 1
xorg-xserver/xorg-server/HISTORY | 3
43 files changed, 231 insertions(+), 144 deletions(-)

New commits:
commit 2b251eddf7ee98bfa9fbe6840ea235ed6d30ff2f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pdksh: fix build with gcc5

commit db6960c5b58231361ad78dac3ce0e6a8dcc1137e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libgpg-error: bump to 1.19, fixing build with gcc

commit 6f83a25d646348df20e41be0cc64c3894c6b026e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

lsb-release: also install a DISTRIB_VERSION for a funny fix for ntp build
that otherwise stumbles over n/a when trying to parse that as version number,
triggering a bash error because of a readonly variable

commit cdbf2836f00916462a490f6d4d4e03ea48521356
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

clamav 0.98.7 SECURITY FIXES

commit 815a966e09373c9b5bb19dd06146c252014a05e5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.12.42 (lts)

commit 2448a9c7b0b23f24919e7943739231346b47886b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

requests: => 2.7.0

commit 37f3ed2e35a04afe59938d1ace0c6b3bdb1f6997
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

glselect.function: just call smgl-gl_select

commit 336c4381cea320eeb317ad9933feada0868b7204
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xorg-server: depends smgl-gl_select

commit 40a3bf4a8a300af278f19c7d7843a36901ca41e2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python-pgpdump: new spell, version 1.5

commit 7d6675f192935fce09e450c37f00184c70b074bc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mpv: properly depend on smgl-gl_select

commit 091747b8ebe0fedc72b89b48d3fc2f8d848da09e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

openscenegraph: depend on smgl-gl_select

commit 85f6886ba199120f95b45c7f11ec567d0f2cfcda
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

mesalib: depend on smgl-gl_select and actually select GL in FINAL

commit ae05256d715c14f7c57daa100ee962352d46f18d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

glu: switch to released version 9.0.0, not unverified git checkout where
nothing happens anyway

commit f97f9c4609185864868c69c3451b25c8867336d6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/llvm: added a fix for building lldb with shared llvm and system
libraries

commit fe5e317daa5b34b14b37d5d0cf24c7074b45bb45
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

email-mime-modifier: spell deprecated, it's a part of email-mime now

diff --git a/ChangeLog b/ChangeLog
index a0d3834..5cdfbcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * glselect.function: Call out to smgl-gl_select to avoid
+ code duplication; spells having to depend on that
+ Spells might call smgl-gl_select in future and this function
+ might be removed.
+
+2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/python-pgpdump: new spell, version 1.5
+
+2015-05-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * perl-cpan/email-mime-modifier: spell deprecated, it's a part of
+ email-mime now
+
2015-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* move grantlee5
* FUNCTIONS: fix qt4-build
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 29915ad..d6a06c3 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.98.6
+ VERSION=0.98.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
@@ -9,7 +9,7 @@
SOURCE_GPG=vendor_clamav.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.clamav.net
LICENSE[0]=GPL
- SECURITY_PATCH=9
+ SECURITY_PATCH=10
ENTERED=20030909
KEYWORDS="antivirus"
SHORT="Clam AntiVirus is an anti-virus toolkit for Unix"
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index 98337c3..e7002ac 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,10 @@
+2015-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.98.7
+ SECURITY_PATCH++
+ fixes CVE-2015-2221 CVE-2015-2222, CVE-2015-2668, CVE-2015-2305,
+ CVE-2015-2170
+ * vendor_clamav.gpg: add 260429A0 "Talos <research AT sourcefire.com"
+
2015-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add libxml2, curl

diff --git a/antivirus/clamav/vendor_clamav.gpg
b/antivirus/clamav/vendor_clamav.gpg
index 1797f4e..24743d6 100644
Binary files a/antivirus/clamav/vendor_clamav.gpg and
b/antivirus/clamav/vendor_clamav.gpg differ
diff --git a/crypto/libgpg-error/DETAILS b/crypto/libgpg-error/DETAILS
index e9f1d50..2ce5dcf 100755
--- a/crypto/libgpg-error/DETAILS
+++ b/crypto/libgpg-error/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgpg-error
- VERSION=1.18
+ VERSION=1.19
PATCHLEVEL=0

SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/crypto/libgpg-error/HISTORY b/crypto/libgpg-error/HISTORY
index 028c88a..1dfb530 100644
--- a/crypto/libgpg-error/HISTORY
+++ b/crypto/libgpg-error/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: 1.19 (hopefully fixing gcc5 build)
+
2015-03-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.18

diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 9b0f44c..2e25994 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,8 @@
+2015-05-05 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, lldb-shared-libs.patch: added a fix for building lldb
+ with shared llvm and system libraries (found here:
+ https://llvm.org/bugs/show_bug.cgi?id=21670#c8)
+
2015-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: use absolute path when sediting CMakeLists.txt

diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 335bfa9..22a9421 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -18,7 +18,9 @@ fi &&
if [[ "$LLVM_WITH_LLDB" == y ]]; then
cd ${SOURCE_DIRECTORY}/tools &&
unpack_file 7 &&
- mv lldb-${VERSION}.src lldb
+ mv lldb-${VERSION}.src lldb &&
+ cd lldb &&
+ patch -p1 < ${SPELL_DIRECTORY}/lldb-shared-libs.patch
fi &&

# small cmake related fix for libffi
diff --git a/devel/llvm/lldb-shared-libs.patch
b/devel/llvm/lldb-shared-libs.patch
new file mode 100644
index 0000000..f267336
--- /dev/null
+++ b/devel/llvm/lldb-shared-libs.patch
@@ -0,0 +1,94 @@
+diff --git a/cmake/LLDBDependencies.cmake b/cmake/LLDBDependencies.cmake
+index 9416a67..86c83d5 100644
+--- a/cmake/LLDBDependencies.cmake
++++ b/cmake/LLDBDependencies.cmake
+@@ -161,6 +161,7 @@ set( LLVM_LINK_COMPONENTS
+ mcdisassembler
+ executionengine
+ option
++ support
+ )
+
+ if ( NOT LLDB_DISABLE_PYTHON )
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index d551ebb..37ffb8f 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -30,6 +30,10 @@ endif ()
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
+ add_subdirectory(API)
+ endif ()
++
++if (BUILD_SHARED_LIBS)
++ set(SHARED_LIBRARY 1)
++endif()
+ add_subdirectory(Breakpoint)
+ add_subdirectory(Commands)
+ add_subdirectory(Core)
+diff --git a/tools/lldb-gdbserver/CMakeLists.txt
b/tools/lldb-gdbserver/CMakeLists.txt
+index 1dc2e1c..e38e69d 100644
+--- a/tools/lldb-gdbserver/CMakeLists.txt
++++ b/tools/lldb-gdbserver/CMakeLists.txt
+@@ -17,26 +17,33 @@ include_directories(../../source)
+
+ include(../../cmake/LLDBDependencies.cmake)
+
+-# have to include lldb and lldb-log files since those are not libraries and
llgs depends on them
+-add_lldb_executable(lldb-gdbserver
+- lldb-gdbserver.cpp
+- ../../source/lldb-log.cpp
+- ../../source/lldb.cpp
+- )
++if ( BUILD_SHARED_LIBS )
++ add_lldb_executable(lldb-gdbserver
++ lldb-gdbserver.cpp
++ )
+
+-# The Darwin linker doesn't understand --start-group/--end-group.
+-if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES
"Darwin")
+- target_link_libraries(lldb-gdbserver
+- -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
++ target_link_libraries(lldb-gdbserver liblldb)
+ else()
+- target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
++ # have to include lldb and lldb-log files since those are not libraries
and llgs depends on them
++ add_lldb_executable(lldb-gdbserver
++ lldb-gdbserver.cpp
++ ../../source/lldb-log.cpp
++ ../../source/lldb.cpp
++ )
++
++ # The Darwin linker doesn't understand --start-group/--end-group.
++ if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}"
MATCHES "Darwin")
++ target_link_libraries(lldb-gdbserver
++ -Wl,--start-group ${LLDB_USED_LIBS}
-Wl,--end-group)
++ else()
++ target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
++ endif()
++ target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
++ llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
++
++ target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
+ endif()
+-target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
+-llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
+-
+-target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
+
+ set_target_properties(lldb-gdbserver PROPERTIES VERSION ${LLDB_VERSION})
+-
+ install(TARGETS lldb-gdbserver
+ RUNTIME DESTINATION bin)
+diff --git a/tools/lldb-mi/CMakeLists.txt b/tools/lldb-mi/CMakeLists.txt
+index cc4347f..9bdca83 100644
+--- a/tools/lldb-mi/CMakeLists.txt
++++ b/tools/lldb-mi/CMakeLists.txt
+@@ -164,7 +164,7 @@ add_lldb_executable(lldb-mi
+ )
+ endif ()
+
+-target_link_libraries(lldb-mi liblldb)
++target_link_libraries(lldb-mi liblldb pthread)
+ # TODO: why isn't this done by add_lldb_executable?
+ #target_link_libraries(lldb-mi ${LLDB_USED_LIBS})
+ #llvm_config(lldb-mi ${LLVM_LINK_COMPONENTS})
diff --git a/glselect.function b/glselect.function
index b2dddd5..1e7cb21 100755
--- a/glselect.function
+++ b/glselect.function
@@ -1,6 +1,7 @@
#---
## glselect - select default libGL provider
## rewritten from smgl-gl_select
+## then modified to call the latter instead, duplication == BAD
##
## this is run in FINAL and will always set the provider
## based on the final spell cast that calls this.
@@ -10,110 +11,6 @@
#---

function glselect(){
- local file_list="
- /usr/lib/libGL.so
- /usr/lib/libGL.so.*
- /usr/lib/xorg/modules/extensions/libdri.la
- /usr/lib/xorg/modules/extensions/libdri.so
- /usr/lib/xorg/modules/extensions/libglx.la
- /usr/lib/xorg/modules/extensions/libglx.so*
- /usr/include/GL/gl.h
- /usr/include/GL/glext.h
- /usr/include/GL/glx.h
- /usr/include/GL/glxext.h
- "
- local dir_list=( \
- "/usr/lib/.ati" \
- "/usr/lib/.nvidia" \
- "/usr/lib/.mesa" \
- "/usr/include/GL/.ati" \
- "/usr/include/GL/.nvidia" \
- "/usr/include/GL/.mesa" \
- "/usr/lib/xorg/modules/extensions/.ati" \
- "/usr/lib/xorg/modules/extensions/.nvidia" \
- "/usr/lib/xorg/modules/extensions/.mesa" \
- )
- local rm_file orig_dir
- local gl_lib=$1
- message "Selecting $gl_lib as the default system GL library"
- if [[ -L ${INSTALL_ROOT}/usr/lib/libGL.so ]] ||
- [[ ! -e ${INSTALL_ROOT}/usr/lib/libGL.so ]]
- then
- message "Cleaning all previous GL providers..."
- for rm_file in $file_list
- do
- rm -f $rm_file
- echo -n "."
- done
- echo -n "."
- echo ""
- message "Done."
- message "Setting up new GL provider $gl_lib..."
- case "$1" in
- ati)
- [[ -e ${INSTALL_ROOT}${dir_list[0]}/libGL.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[0]}/* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
- [[ -e ${INSTALL_ROOT}${dir_list[3]}/gl.h ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[3]}/* \
- ${INSTALL_ROOT}/usr/include/GL/ 2>/dev/null
- [[ -e ${INSTALL_ROOT}${dir_list[6]}/libglx.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[6]}/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/ 2>/dev/null
- echo -n "."
- ;;
- mesa)
- [[ -e ${INSTALL_ROOT}${dir_list[2]}/libGL.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[2]}/* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
- [[ -e ${INSTALL_ROOT}${dir_list[5]}/gl.h ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[5]}/* \
- ${INSTALL_ROOT}/usr/include/GL/ 2>/dev/null
- [[ -e ${INSTALL_ROOT}${dir_list[8]}/libglx.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[8]}/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/ 2>/dev/null
- echo -n "."
- ;;
-nvidia)
- [[ -e ${INSTALL_ROOT}${dir_list[1]}/libGL.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[1]}/* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
- [[ -e ${INSTALL_ROOT}${dir_list[4]}/gl.h ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[4]}/* \
- ${INSTALL_ROOT}/usr/include/GL/ 2>/dev/null
- [[ -e ${INSTALL_ROOT}${dir_list[7]}/libglx.so ]] &&
- ln -sf ${INSTALL_ROOT}${dir_list[7]}/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/ 2>/dev/null
- echo -n "."
- ;;
- *) message "Unknown secondary files so I only linked the libGL.so"
- ln -fs ${INSTALL_ROOT}/usr/lib/$gl_lib/libGL.so* \
- ${INSTALL_ROOT}/usr/lib/ 2>/dev/null
- ;;
- esac
- echo -e "\nDone."
- message "You can manage the libGL providers at runtime by using"
- message "either smgl-gl_select or manually by symlinking the files"
- message "from their respective directories i.e.:"
- message "/usr/lib/.[nvidia|ati|mesa]/libGL.so"
- message
"/usr/lib/xorg/modules/extensions/.[nvidia,ati,mesa]/lib{glx,dri}.so"
- message "/usr/include/GL/.[nvidia|ati|mesa]/gl{x,xext,ext}.h"
- message ""
- message "To:"
- message "/usr/lib/libGL.so"
- message "/usr/lib/xorg/modules/extensions/lib{glx,dri}.so"
- message "/usr/include/GL/gl{x,xext,ext}.h"
- message ""
- return 0
- else
- message "Error ${INSTALL_ROOT}/usr/lib/libGL.so is not a symlink"
- message "unable to proceed!!!"
- message "Please recast:"
- message "mesalib, xorg-server and whatever GL driver you use."
- message ""
- message "If this continues to happen please file a bug."
- message ""
- return 1
- fi
+ message "${MESSAGE_COLOR}Calling smgl-gl_select to switch to
$1.$DEFAULT_COLOR" &&
+ smgl-gl_select -s "$1"
}
-
diff --git a/graphics-libs/glu/DETAILS b/graphics-libs/glu/DETAILS
index ca31992..f9cc80a 100755
--- a/graphics-libs/glu/DETAILS
+++ b/graphics-libs/glu/DETAILS
@@ -1,15 +1,9 @@
SPELL=glu
- if [[ $GLU_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=git
- fi
- SOURCE=${SPELL}-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
- SOURCE_URL=git_http://cgit.freedesktop.org/mesa/glu:$SPELL-git
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=1
+ VERSION=9.0.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL=ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2
+
SOURCE_HASH=sha512:ff920e3fbca739794e1432a92fdd8517aa732110fea71ed724185425042f83ce18e9866c16f95c6e10f6993f0814a90fac9636e2b3d8ca2084d1ac0a860f61c8
WEB_SITE=http://www.mesa3d.org
ENTERED=20120901
LICENSE[0]=GPL
@@ -21,3 +15,4 @@ provide higher-level drawing routines from the more
primitive routines that
OpenGL provides. It is usually distributed with the base OpenGL package.
GLU is not implemented in the embedded version of the OpenGL package, OpenGL
ES.
EOF
+
diff --git a/graphics-libs/glu/HISTORY b/graphics-libs/glu/HISTORY
index d45c343..b77e370 100644
--- a/graphics-libs/glu/HISTORY
+++ b/graphics-libs/glu/HISTORY
@@ -1,3 +1,7 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: switch to released 9.0.0
+ * PRE_BUILD, PREPARE: removed
+
2014-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: MESALIB => mesalib

diff --git a/graphics-libs/glu/PREPARE b/graphics-libs/glu/PREPARE
deleted file mode 100755
index a68f274..0000000
--- a/graphics-libs/glu/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch scm
diff --git a/graphics-libs/glu/PRE_BUILD b/graphics-libs/glu/PRE_BUILD
deleted file mode 100755
index f6d2b08..0000000
--- a/graphics-libs/glu/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-
-cd "$SOURCE_DIRECTORY" &&
-
-NOCONFIGURE=on ./autogen.sh
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index ae489af..daf26eb 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -1,5 +1,6 @@
. "$GRIMOIRE/FUNCTIONS" &&

+depends smgl-gl_select &&
depends -sub 'CXX' gcc &&
depends bison &&
depends flex &&
diff --git a/graphics-libs/mesalib/FINAL b/graphics-libs/mesalib/FINAL
new file mode 100755
index 0000000..1895a77
--- /dev/null
+++ b/graphics-libs/mesalib/FINAL
@@ -0,0 +1 @@
+glselect mesa
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 121ea09..6dc07c3 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depend on smgl-gl_select
+ * FINAL: call glselect (smgl-gl_select behind it)
+
2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 10.5.4
* DEPENDS: add gettext
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index fde4d16..9c2f3b6 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.12.42: added
+
2015-05-02 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.12.41: added

diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42
new file mode 100755
index 0000000..0fa843c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42
@@ -0,0 +1,5 @@
+appliedkernels="3.12"
+patchversion="${appliedkernels}.42"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="32a1ece6749862436ca61f3dfb438429c81abc43"
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 9d785b4..5234dba 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -12,6 +12,7 @@ depends libice &&
depends libxml2 &&
depends libxrandr &&
depends mesalib &&
+depends smgl-gl_select &&
depends tiff &&
depends unzip &&
depends zlib &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 8395d2f..89157d2 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: smgl-gl_select
+
2014-10-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.2.1

diff --git a/perl-cpan/email-mime-modifier/BUILD
b/perl-cpan/email-mime-modifier/BUILD
index 2de29cd..27ba77d 100755
--- a/perl-cpan/email-mime-modifier/BUILD
+++ b/perl-cpan/email-mime-modifier/BUILD
@@ -1 +1 @@
-default_build_perl
+true
diff --git a/perl-cpan/email-mime-modifier/CONFLICTS
b/perl-cpan/email-mime-modifier/CONFLICTS
new file mode 100755
index 0000000..d78fdfe
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/CONFLICTS
@@ -0,0 +1 @@
+conflicts email-mime y
diff --git a/perl-cpan/email-mime-modifier/DEPENDS
b/perl-cpan/email-mime-modifier/DEPENDS
deleted file mode 100755
index e71ea80..0000000
--- a/perl-cpan/email-mime-modifier/DEPENDS
+++ /dev/null
@@ -1,8 +0,0 @@
-depends perl &&
-depends mime-types &&
-depends email-mime &&
-depends email-mime-encodings &&
-depends email-mime-contenttype &&
-depends email-simple &&
-depends email-messageid &&
-depends email-address
diff --git a/perl-cpan/email-mime-modifier/DETAILS
b/perl-cpan/email-mime-modifier/DETAILS
index 865c510..e22de76 100755
--- a/perl-cpan/email-mime-modifier/DETAILS
+++ b/perl-cpan/email-mime-modifier/DETAILS
@@ -1,9 +1,9 @@
SPELL=email-mime-modifier
VERSION=1.444
- SOURCE="Email-MIME-Modifier-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RJ/RJBS/${SOURCE}
-
SOURCE_HASH=sha512:5cbb0dbdc7423e41b6a49caad99d31cea5b8a9a87a51abb15b5de45f94b17a7fb1c7662d24a4e9399d84b8afd2af798fdd29ef01a72e084b365fa8b4268d8807
+ PATCHLEVEL=1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Email-MIME-Modifier-${VERSION}"
+ GATHER_DOCS=off
+ ARCHIVE=off

WEB_SITE="http://search.cpan.org/search?query=Email%3A%3AMIME%3A%3AModifier&mode=all";
LICENSE[0]=ART
ENTERED=20080630
diff --git a/perl-cpan/email-mime-modifier/HISTORY
b/perl-cpan/email-mime-modifier/HISTORY
index 28ebb77..6515c11 100644
--- a/perl-cpan/email-mime-modifier/HISTORY
+++ b/perl-cpan/email-mime-modifier/HISTORY
@@ -1,3 +1,8 @@
+2015-05-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, BUILD: deprecated in favour of email-mime
+ * DEPENDS: removed
+ * PRE_BUILD, INSTALL, UP_TRIGGERS, CONFLICTS: added
+
2009-09-14 David Kowis <dkowis AT shlrm.org>
* DETAILS: to latest version

diff --git a/perl-cpan/email-mime-modifier/INSTALL
b/perl-cpan/email-mime-modifier/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/email-mime-modifier/PRE_BUILD
b/perl-cpan/email-mime-modifier/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/email-mime-modifier/UP_TRIGGERS
b/perl-cpan/email-mime-modifier/UP_TRIGGERS
new file mode 100755
index 0000000..3c39fde
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger email-mime-modifier dispel_self &&
+up_trigger email-mime cast_self
diff --git a/python-pypi/python-pgpdump/DEPENDS
b/python-pypi/python-pgpdump/DEPENDS
new file mode 100755
index 0000000..e440941
--- /dev/null
+++ b/python-pypi/python-pgpdump/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/python-pgpdump/DETAILS
b/python-pypi/python-pgpdump/DETAILS
new file mode 100755
index 0000000..562b757
--- /dev/null
+++ b/python-pypi/python-pgpdump/DETAILS
@@ -0,0 +1,28 @@
+ SPELL=python-pgpdump
+ SPELLX=pgpdump
+ VERSION=1.5
+ SOURCE="${SPELLX}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELLX}/${SOURCE}
+
SOURCE_HASH=sha512:b9fc7f78b920296301acaad2dbbafefff7b5f1658cbb65f5892a28d0b4d5110581bba984ad5cdabde3330025e3828387d7127c689cb86a7163c0b5ac0d0d2de0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE=https://github.com/toofishes/python-pgpdump
+ DOCS="README"
+ LICENSE[0]=BSD
+ KEYWORDS="python pgp"
+ ENTERED=20150505
+ SHORT="Python library for parsing PGP packets"
+cat << EOF
+pgpdump is a PGP packet parser library.
+
+The intent here is not on completeness, as we don’t currently decode every
+packet type, but on being able to do what people actually have to 95% of the
+time.
+
+Currently supported things include:
+
+* Signature packets
+* Public key packets
+* Secret key packets
+* Trust, user ID, and user attribute packets
+* ASCII-armor decoding and CRC check
+EOF
diff --git a/python-pypi/python-pgpdump/HISTORY
b/python-pypi/python-pgpdump/HISTORY
new file mode 100644
index 0000000..e1b9b3e
--- /dev/null
+++ b/python-pypi/python-pgpdump/HISTORY
@@ -0,0 +1,2 @@
+2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 1.5
diff --git a/python-pypi/requests/DETAILS b/python-pypi/requests/DETAILS
index 39d7861..7acdc22 100755
--- a/python-pypi/requests/DETAILS
+++ b/python-pypi/requests/DETAILS
@@ -1,8 +1,8 @@
SPELL=requests
- VERSION=2.6.0
+ VERSION=2.7.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:703728e04f4ae5f083892e1ad0cb54777ebcc0120fca9cd3c170e33233fccbb64a635e141e6d7b9c1f1f9d62dc00aa7c66ea890ae62cd6581c881c071a707510
+
SOURCE_HASH=sha512:a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=APACHE
WEB_SITE=http://python-requests.org/
diff --git a/python-pypi/requests/HISTORY b/python-pypi/requests/HISTORY
index da98506..5c18b1a 100644
--- a/python-pypi/requests/HISTORY
+++ b/python-pypi/requests/HISTORY
@@ -1,2 +1,5 @@
+2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.7.0
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: created spell
diff --git a/shell-term-fm/pdksh/HISTORY b/shell-term-fm/pdksh/HISTORY
index 672584c..60da0ea 100644
--- a/shell-term-fm/pdksh/HISTORY
+++ b/shell-term-fm/pdksh/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: another hack to make it work with gcc 5
+
2008-10-09 Remko van der Vossen <wich AT sourcemage.org>
* POST_RESURRECT: Added, fix bug 14335

diff --git a/shell-term-fm/pdksh/PRE_BUILD b/shell-term-fm/pdksh/PRE_BUILD
index c71bde5..1fefbdc 100755
--- a/shell-term-fm/pdksh/PRE_BUILD
+++ b/shell-term-fm/pdksh/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit "s,sort +2n +0n,sort -nk3,1" siglist.sh
+sed -i "s,sort +2n +0n,sort -nk3,1" siglist.sh &&
+# Avoid breakage due to gcc 5 cpp changes.
+sed -i 's:\(siglist.sh "\$(CPP) \$(CPPFLAGS)\):\1 -P:' Makefile.in
diff --git a/smgl/lsb-release/DETAILS b/smgl/lsb-release/DETAILS
index 43a2a2d..ebd503d 100755
--- a/smgl/lsb-release/DETAILS
+++ b/smgl/lsb-release/DETAILS
@@ -1,5 +1,6 @@
SPELL=lsb-release
VERSION=1.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/smgl/lsb-release/HISTORY b/smgl/lsb-release/HISTORY
index f705860..110be43 100644
--- a/smgl/lsb-release/HISTORY
+++ b/smgl/lsb-release/HISTORY
@@ -1,3 +1,8 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * INSTALL: add a DISTRIB_RELEASE=0, which fixes otherwise confused
+ build scripts (example: ntp with broken sed because of "n/a")
+ * DETAILS: PATCHLEVEL++
+
2009-05-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: Created

diff --git a/smgl/lsb-release/INSTALL b/smgl/lsb-release/INSTALL
index a54cfff..9120701 100755
--- a/smgl/lsb-release/INSTALL
+++ b/smgl/lsb-release/INSTALL
@@ -4,4 +4,5 @@ mkdir -p "$INSTALL_ROOT/etc/lsb-release.d"
&&
cat > "$INSTALL_ROOT/etc/lsb-release" << EOF
DISTRIB_ID="Source Mage"
DISTRIB_DESCRIPTION="Linux so advanced, it may as well be magic"
+DISTRIB_RELEASE=0
EOF
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index 92db750..4fe5b7b 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -201,7 +201,7 @@ else
fi &&

if is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL); then
- suggest_depends smgl-gl_select "" "" "to switch between OPENGL providers
in userspace"
+ depends smgl-gl_select
fi &&

if is_depends_enabled $SPELL $(get_spell_provider $SPELL LUA); then
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 234e04f..7848fe5 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: definitely depend on smgl-gl_select
+
2015-04-26 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 0.9.0, waf 1.8.9
* BUILD: uses waf_build from FUNCTIONS again
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 0ffa9f1..a03bfdf 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -156,6 +156,7 @@ depends pkgconfig &&
depends libtool &&
depends AWK &&
depends mesalib &&
+depends smgl-gl_select &&
depends rgb &&
depends font-cursor-misc &&
depends font-misc-misc &&
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index d7a7fcd..b48e003 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: on smgl-gl_select
+
2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, xorg-server-1.17.1-gcc5_fixes-1.patch: add patch from
LFS to fix build with gcc 5


  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ab671093bfa90f6fffb48445f9d45bd7ab775a57), Treeve Jelbert, 05/06/2015

Archive powered by MHonArc 2.6.24.

Top of Page