calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Create patch templates

Browse Source
atratsevskiy
Хирецкий Михаил 11 years ago
parent 99fb95ae41
commit bab18b873c
98 changed files with 1591 additions and 26068 deletions
Show Stats Download Patch File Download Diff File

35
profiles/calculate/profile.bashrc
Unescape View File

@ -185,23 +185,28 @@ pre_pkg_postinst() {
rm -f /var/lib/calculate/-CONTENTS-*
}
if [[ `readlink -f /etc/portage/bashrc` != "/usr/calculate/install/bashrc" ]] || [[ ! -f /etc/portage/bashrc ]]
then
PATCH_OVERLAY="/usr/local/portage/layman/calculate/profiles/patches"
[[ -d "/var/lib/layman/calculate/profiles/patches" ]] && \
PATCH_OVERLAY="/var/lib/layman/calculate/profiles/patches"
PATH=${PATH}:/usr/sbin:/usr/bin:/bin:/sbin
if [[ ${EBUILD_PHASE} == compile ]]; then
if [[ ! -f ${PORTAGE_BUILDDIR}/.patched || \
( ${PORTAGE_BUILDDIR}/.unpacked -nt ${PORTAGE_BUILDDIR}/.patched ) ]]; then
touch "${PORTAGE_BUILDDIR}/.patched"
elif [[ "${PORTAGE_BUILDDIR}/.unpacked" -nt "${PORTAGE_BUILDDIR}/.patched" ]]; then
einfo ">>> WORKDIR is up-to-date and patched, keeping..."
CL_CORE_PATCH=/usr/sbin/cl-core-patch
if [[ ${EBUILD_PHASE} == "compile" ]] && [ -e ${CL_CORE_PATCH} ];then
${CL_CORE_PATCH} --no-progress --pkg-version ${PVR} --pkg-slot ${SLOT} --pkg-category ${CATEGORY} --pkg-path ${S} --pkg-name ${PN} --verbose
else
if [[ `readlink -f /etc/portage/bashrc` != "/usr/calculate/install/bashrc" ]] || [[ ! -f /etc/portage/bashrc ]]
then
PATCH_OVERLAY="/usr/local/portage/layman/calculate/profiles/patches"
[[ -d "/var/lib/layman/calculate/profiles/patches" ]] && \
PATCH_OVERLAY="/var/lib/layman/calculate/profiles/patches"
PATH=${PATH}:/usr/sbin:/usr/bin:/bin:/sbin
if [[ ${EBUILD_PHASE} == compile ]]; then
if [[ ! -f ${PORTAGE_BUILDDIR}/.patched || \
( ${PORTAGE_BUILDDIR}/.unpacked -nt ${PORTAGE_BUILDDIR}/.patched ) ]]; then
touch "${PORTAGE_BUILDDIR}/.patched"
elif [[ "${PORTAGE_BUILDDIR}/.unpacked" -nt "${PORTAGE_BUILDDIR}/.patched" ]]; then
einfo ">>> WORKDIR is up-to-date and patched, keeping..."
fi
fi
fi
pkgpatch
pkgpatch
fi
fi
# Update configuration files for package installation

101
profiles/patches/app-admin/eselect-1.2.15-profile.patch
Unescape View File

@ -1,101 +0,0 @@
diff --git a/profile.eselect b/profile.eselect
index 521825e..9aef02c 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -11,6 +11,13 @@ MAINTAINER="eselect@gentoo.org"
SVN_DATE='$Date: 2011-03-15 15:51:32 +0100 (Tue, 15 Mar 2011) $'
VERSION=$(svn_date_to_version "${SVN_DATE}")
+# get a list of valid profiles
+# add calculate overlay to profiles
+NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
+[[ -d ${NEW_CALCULATE_OVERLAY} ]] &&
+ CALCULATE_OVERLAY=${NEW_CALCULATE_OVERLAY} ||
+ CALCULATE_OVERLAY="/usr/local/portage/layman/calculate"
+
# get location of make.profile symlink
get_symlink_location() {
local oldloc=${EROOT%/}/etc/make.profile
@@ -35,6 +42,17 @@ find_targets() {
arch=$(arch)
[[ -z ${arch} ]] && return 1
+ # add support calculate overlay
+ if [[ -f "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc" ]]
+ then
+ for p in $(sed -n -e \
+ "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+ do
+ echo ${p}
+ done
+ fi
+
for p in $(sed -n -e "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
"${ROOT}${portdir}/profiles/profiles.desc")
do
@@ -70,6 +88,24 @@ set_symlink() {
if [[ ${arch} != ${parch} && -z ${force} ]]; then
die -q "${target} is not a valid profile for ${arch}"
fi
+ # add support calculate overlay
+ elif [[ -n ${target} && -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]]
+ then
+ local arch parch
+
+ # if the profile was explicitly specified (rather than a number)
+ # double check and make sure it's valid
+ arch=$(arch)
+ [[ -z ${arch} && -z ${force} ]] && return 1
+
+ # do a reverse lookup and find the arch associated with ${target}
+ parch=$(sed -n -e \
+ "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+
+ if [[ ${arch} != ${parch} && -z ${force} ]] ; then
+ die -q "${target} is not a valid profile for ${arch}"
+ fi
fi
if [[ -z ${target} ]]; then
@@ -91,6 +127,17 @@ set_symlink() {
write_warning_msg \
"Strange path. Check ${MAKE_PROFILE} symlink"
fi
+ # add support calculate overlay
+ elif [[ -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]] ; then
+ # we must call remove_symlink() here instead of calling
+ # it from do_set(), since if the link is removed, we
+ # cannot determine $ARCH in find_targets()
+ if [[ -L ${MAKE_PROFILE} ]] ; then
+ remove_symlink \
+ || die -q "Couldn't remove current make.profile symlink"
+ fi
+ ln -s "..${CALCULATE_OVERLAY}/profiles/${target}" \
+ "${EROOT}/etc/make.profile"
else
die -q "Target \"$1\" doesn't appear to be valid!"
fi
@@ -110,6 +157,10 @@ do_show() {
local portdir=$(portageq portdir)
local profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
link=${link##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ link=${link##${calcprofiledir}/}
+
write_kv_list_entry "${link}" ""
else
write_kv_list_entry "(unset)" ""
@@ -133,6 +184,10 @@ do_list() {
profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
active=$(canonicalise "${MAKE_PROFILE}")
active=${active##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ active=${active##${calcprofiledir}/}
+
if [[ -n ${targets[@]} ]]; then
local i
for (( i = 0; i < ${#targets[@]}; i++ )); do

101
profiles/patches/app-admin/eselect-1.2.17-18-profile.patch
Unescape View File

@ -1,101 +0,0 @@
diff --git a/profile.eselect b/profile.eselect
index 521825e..9aef02c 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -11,6 +11,13 @@ MAINTAINER="eselect@gentoo.org"
SVN_DATE='$Date: 2011-03-15 15:51:32 +0100 (Tue, 15 Mar 2011) $'
VERSION=$(svn_date_to_version "${SVN_DATE}")
+# get a list of valid profiles
+# add calculate overlay to profiles
+NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
+[[ -d ${NEW_CALCULATE_OVERLAY} ]] &&
+ CALCULATE_OVERLAY=${NEW_CALCULATE_OVERLAY} ||
+ CALCULATE_OVERLAY="/usr/local/portage/layman/calculate"
+
# get location of make.profile symlink
get_symlink_location() {
local oldloc=${EROOT%/}/etc/make.profile
@@ -35,6 +42,17 @@ find_targets() {
arch=$(arch)
[[ -z ${arch} ]] && return 1
+ # add support calculate overlay
+ if [[ -f "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc" ]]
+ then
+ for p in $(sed -n -e \
+ "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+ do
+ echo ${p}
+ done
+ fi
+
for p in $(sed -n -e "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
"${ROOT}${portdir}/profiles/profiles.desc")
do
@@ -70,6 +88,24 @@ set_symlink() {
if [[ ${arch} != ${parch} && -z ${force} ]]; then
die -q "${target} is not a valid profile for ${arch}"
fi
+ # add support calculate overlay
+ elif [[ -n ${target} && -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]]
+ then
+ local arch parch
+
+ # if the profile was explicitly specified (rather than a number)
+ # double check and make sure it's valid
+ arch=$(arch)
+ [[ -z ${arch} && -z ${force} ]] && return 1
+
+ # do a reverse lookup and find the arch associated with ${target}
+ parch=$(sed -n -e \
+ "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+
+ if [[ ${arch} != ${parch} && -z ${force} ]] ; then
+ die -q "${target} is not a valid profile for ${arch}"
+ fi
fi
if [[ -z ${target} ]]; then
@@ -91,6 +127,17 @@ set_symlink() {
write_warning_msg \
"Strange path. Check ${MAKE_PROFILE} symlink"
fi
+ # add support calculate overlay
+ elif [[ -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]] ; then
+ # we must call remove_symlink() here instead of calling
+ # it from do_set(), since if the link is removed, we
+ # cannot determine $ARCH in find_targets()
+ if [[ -L ${MAKE_PROFILE} ]] ; then
+ remove_symlink \
+ || die -q "Couldn't remove current make.profile symlink"
+ fi
+ ln -s "..${CALCULATE_OVERLAY}/profiles/${target}" \
+ "${EROOT}/etc/make.profile"
else
die -q "Target \"$1\" doesn't appear to be valid!"
fi
@@ -110,6 +157,10 @@ do_show() {
local portdir=$(portageq portdir)
local profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
link=${link##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ link=${link##${calcprofiledir}/}
+
write_kv_list_entry "${link}" ""
else
write_kv_list_entry "(unset)" ""
@@ -133,6 +184,10 @@ do_list() {
profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
active=$(canonicalise "${MAKE_PROFILE}")
active=${active##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ active=${active##${calcprofiledir}/}
+
if [[ -n ${targets[@]} ]]; then
local i
for (( i = 0; i < ${#targets[@]}; i++ )); do

99
profiles/patches/app-admin/eselect-1.2.3-profile.patch
Unescape View File

@ -1,99 +0,0 @@
diff --git a/modules/profile.eselect b/modules/profile.eselect
index 813fea2..86c49b3 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -11,6 +11,11 @@ MAINTAINER="eselect@gentoo.org"
SVN_DATE='$Date: 2009-09-20 22:26:07 +0200 (Sun, 20 Sep 2009) $'
VERSION=$(svn_date_to_version "${SVN_DATE}")
+NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
+[[ -d ${NEW_CALCULATE_OVERLAY} ]] &&
+ CALCULATE_OVERLAY=${NEW_CALCULATE_OVERLAY} ||
+ CALCULATE_OVERLAY="/usr/local/portage/layman/calculate"
+
# get a list of valid profiles
find_targets() {
local arch p portdir=${1}
@@ -19,6 +24,17 @@ find_targets() {
arch=$(arch)
[[ -z ${arch} ]] && return 1
+ # add support calculate overlay
+ if [[ -f "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc" ]]
+ then
+ for p in $(sed -n -e \
+ "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+ do
+ echo ${p}
+ done
+ fi
+
for p in $(sed -n -e "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
"${ROOT}${portdir}/profiles/profiles.desc")
do
@@ -55,6 +71,24 @@ set_symlink() {
if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then
die -q "${target} is not a valid profile for ${arch}"
fi
+ # add support calculate overlay
+ elif [[ -n ${target} && -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]]
+ then
+ local arch parch
+
+ # if the profile was explicitly specified (rather than a number)
+ # double check and make sure it's valid
+ arch=$(arch)
+ [[ -z ${arch} && ${2} != "--force" ]] && return 1
+
+ # do a reverse lookup and find the arch associated with ${target}
+ parch=$(sed -n -e \
+ "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+
+ if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then
+ die -q "${target} is not a valid profile for ${arch}"
+ fi
fi
if [[ -z ${target} ]] ; then
@@ -69,6 +103,17 @@ set_symlink() {
fi
ln -s "..${portdir#"${EPREFIX}"}/profiles/${target}" \
"${EROOT}/etc/make.profile"
+ # add support calculate overlay
+ elif [[ -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]] ; then
+ # we must call remove_symlink() here instead of calling
+ # it from do_set(), since if the link is removed, we
+ # cannot determine $ARCH in find_targets()
+ if [[ -L ${EROOT}/etc/make.profile ]] ; then
+ remove_symlink \
+ || die -q "Couldn't remove current make.profile symlink"
+ fi
+ ln -s "..${CALCULATE_OVERLAY}/profiles/${target}" \
+ "${EROOT}/etc/make.profile"
else
die -q "Target \"${1}\" doesn't appear to be valid!"
fi
@@ -87,6 +132,10 @@ do_show() {
local portdir=$(portageq portdir)
local profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
link=${link##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ link=${link##${calcprofiledir}/}
+
write_kv_list_entry "${link}" ""
else
write_kv_list_entry "(unset)" ""
@@ -109,6 +158,10 @@ do_list() {
profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
active=$(canonicalise "${EROOT}/etc/make.profile")
active=${active##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ active=${active##${calcprofiledir}/}
+
if [[ -n ${targets[@]} ]] ; then
local i
for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do

111
profiles/patches/app-admin/eselect-1.2.5-8-profile.patch
Unescape View File

@ -1,111 +0,0 @@
diff --git a/modules/profile.eselect b/modules/profile.eselect
index 5e18178..2cd43a6 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -1,16 +1,21 @@
# -*-eselect-*- vim: ft=eselect
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: profile.eselect 736 2009-11-20 19:36:14Z ulm $
+# $Id: profile.eselect 727 2009-11-14 18:08:51Z ulm $
# This is a portage-only module.
inherit package-manager
DESCRIPTION="Manage the /etc/make.profile symlink"
MAINTAINER="eselect@gentoo.org"
-SVN_DATE='$Date: 2009-11-20 20:36:14 +0100 (Fri, 20 Nov 2009) $'
+SVN_DATE='$Date: 2009-11-14 19:08:51 +0100 (Sat, 14 Nov 2009) $'
VERSION=$(svn_date_to_version "${SVN_DATE}")
+NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
+[[ -d ${NEW_CALCULATE_OVERLAY} ]] &&
+ CALCULATE_OVERLAY=${NEW_CALCULATE_OVERLAY} ||
+ CALCULATE_OVERLAY="/usr/local/portage/layman/calculate"
+
# get a list of valid profiles
find_targets() {
local arch p portdir=${1}
@@ -19,6 +24,17 @@ find_targets() {
arch=$(arch)
[[ -z ${arch} ]] && return 1
+ # add support calculate overlay
+ if [[ -f "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc" ]]
+ then
+ for p in $(sed -n -e \
+ "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+ do
+ echo ${p}
+ done
+ fi
+
for p in $(sed -n -e "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
"${ROOT}${portdir}/profiles/profiles.desc")
do
@@ -54,6 +70,24 @@ set_symlink() {
if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then
die -q "${target} is not a valid profile for ${arch}"
fi
+ # add support calculate overlay
+ elif [[ -n ${target} && -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]]
+ then
+ local arch parch
+
+ # if the profile was explicitly specified (rather than a number)
+ # double check and make sure it's valid
+ arch=$(arch)
+ [[ -z ${arch} && ${2} != "--force" ]] && return 1
+
+ # do a reverse lookup and find the arch associated with ${target}
+ parch=$(sed -n -e \
+ "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+
+ if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then
+ die -q "${target} is not a valid profile for ${arch}"
+ fi
fi
if [[ -z ${target} ]] ; then
@@ -75,6 +109,17 @@ set_symlink() {
write_warning_msg \
"Strange path. Check ${EROOT}/etc/make.profile symlink"
fi
+ # add support calculate overlay
+ elif [[ -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]] ; then
+ # we must call remove_symlink() here instead of calling
+ # it from do_set(), since if the link is removed, we
+ # cannot determine $ARCH in find_targets()
+ if [[ -L ${EROOT}/etc/make.profile ]] ; then
+ remove_symlink \
+ || die -q "Couldn't remove current make.profile symlink"
+ fi
+ ln -s "..${CALCULATE_OVERLAY}/profiles/${target}" \
+ "${EROOT}/etc/make.profile"
else
die -q "Target \"${1}\" doesn't appear to be valid!"
fi
@@ -93,6 +138,10 @@ do_show() {
local portdir=$(portageq portdir)
local profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
link=${link##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ link=${link##${calcprofiledir}/}
+
write_kv_list_entry "${link}" ""
else
write_kv_list_entry "(unset)" ""
@@ -115,6 +164,10 @@ do_list() {
profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
active=$(canonicalise "${EROOT}/etc/make.profile")
active=${active##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ active=${active##${calcprofiledir}/}
+
if [[ -n ${targets[@]} ]] ; then
local i
for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do

100
profiles/patches/app-admin/eselect-1.2.9-14-profile.patch
Unescape View File

@ -1,100 +0,0 @@
diff --git a/modules/profile.eselect b/modules/profile.eselect
index 488e6df..a678d52 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -12,6 +12,12 @@ SVN_DATE='$Date: 2010-02-05 21:58:39 +0100 (Fri, 05 Feb 2010) $'
VERSION=$(svn_date_to_version "${SVN_DATE}")
# get a list of valid profiles
+# add calculate overlay to profiles
+NEW_CALCULATE_OVERLAY="/var/lib/layman/calculate"
+[[ -d ${NEW_CALCULATE_OVERLAY} ]] &&
+ CALCULATE_OVERLAY=${NEW_CALCULATE_OVERLAY} ||
+ CALCULATE_OVERLAY="/usr/local/portage/layman/calculate"
+
find_targets() {
local arch p portdir=${1}
[[ -n ${portdir} ]] || portdir=$(portageq portdir)
@@ -19,6 +25,17 @@ find_targets() {
arch=$(arch)
[[ -z ${arch} ]] && return 1
+ # add support calculate overlay
+ if [[ -f "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc" ]]
+ then
+ for p in $(sed -n -e \
+ "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+ do
+ echo ${p}
+ done
+ fi
+
for p in $(sed -n -e "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
"${ROOT}${portdir}/profiles/profiles.desc")
do
@@ -54,6 +71,24 @@ set_symlink() {
if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then
die -q "${target} is not a valid profile for ${arch}"
fi
+ # add support calculate overlay
+ elif [[ -n ${target} && -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]]
+ then
+ local arch parch
+
+ # if the profile was explicitly specified (rather than a number)
+ # double check and make sure it's valid
+ arch=$(arch)
+ [[ -z ${arch} && ${2} != "--force" ]] && return 1
+
+ # do a reverse lookup and find the arch associated with ${target}
+ parch=$(sed -n -e \
+ "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "${ROOT}${CALCULATE_OVERLAY}/profiles/profiles.desc")
+
+ if [[ ${arch} != ${parch} && ${2} != "--force" ]] ; then
+ die -q "${target} is not a valid profile for ${arch}"
+ fi
fi
if [[ -z ${target} ]] ; then
@@ -75,6 +110,17 @@ set_symlink() {
write_warning_msg \
"Strange path. Check ${EROOT}/etc/make.profile symlink"
fi
+ # add support calculate overlay
+ elif [[ -d ${ROOT}${CALCULATE_OVERLAY}/profiles/${target} ]] ; then
+ # we must call remove_symlink() here instead of calling
+ # it from do_set(), since if the link is removed, we
+ # cannot determine $ARCH in find_targets()
+ if [[ -L ${EROOT}/etc/make.profile ]] ; then
+ remove_symlink \
+ || die -q "Couldn't remove current make.profile symlink"
+ fi
+ ln -s "..${CALCULATE_OVERLAY}/profiles/${target}" \
+ "${EROOT}/etc/make.profile"
else
die -q "Target \"${1}\" doesn't appear to be valid!"
fi
@@ -93,6 +139,10 @@ do_show() {
local portdir=$(portageq portdir)
local profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
link=${link##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ link=${link##${calcprofiledir}/}
+
write_kv_list_entry "${link}" ""
else
write_kv_list_entry "(unset)" ""
@@ -115,6 +165,10 @@ do_list() {
profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
active=$(canonicalise "${EROOT}/etc/make.profile")
active=${active##${profiledir}/}
+ # add support calculate overlay
+ calcprofiledir=$(canonicalise "${ROOT}${CALCULATE_OVERLAY}/profiles")
+ active=${active##${calcprofiledir}/}
+
if [[ -n ${targets[@]} ]] ; then
local i
for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do

48
profiles/patches/app-portage/layman-1.3-9-update.sh
Unescape View File

@ -1,48 +0,0 @@
if [[ ${EBUILD_PHASE} == postinst ]]
then
NEED_INFO=
if [[ ! -L ${ROOT}/usr/local/portage/layman ]] &&
[[ -e ${ROOT}/usr/local/portage/layman ]]
then
ebegin "Move overlays"
local res=0
if [[ -f ${ROOT}/usr/local/portage/layman/make.conf ]]
then
sed -ri 's|/usr/local/portage/layman|/var/lib/layman|' \
${ROOT}/usr/local/portage/layman/make.conf || res=1
fi
mkdir -p ${ROOT}/var/lib/layman || res=1
if [[ -n $(ls -A ${ROOT}/usr/local/portage/layman/) ]]
then
mv ${ROOT}/usr/local/portage/layman/* ${ROOT}/var/lib/layman/ || res=1
fi
if [[ -f ${ROOT}/etc/layman/layman.cfg ]]
then
sed -ri 's|^(storage\s*:\s*)\S+$|\1/var/lib/layman|' ${ROOT}/etc/layman/layman.cfg || res=1
fi
if [[ -f ${ROOT}/etc/layman/layman.cfg ]]
then
sed -ri 's|^(overlays\s*:\s*)\S+$|\1http://www.gentoo.org/proj/en/overlays/repositories.xml|' ${ROOT}/etc/layman/layman.cfg || res=1
fi
rm -rf ${ROOT}/usr/local/portage/layman || res=1
ln -s /var/lib/layman ${ROOT}/usr/local/portage/layman || res=1
NEED_INFO=1
eend $res
fi
MAKEPROFILELINK=$( readlink ${ROOT}/etc/make.profile )
if [[ "$MAKEPROFILELINK" =~ usr/local/portage/layman ]]
then
ebegin "Fix make.profile link"
rm -f /etc/make.profile &&
ln -sf ${MAKEPROFILELINK/usr\/local\/portage\/layman/var\/lib\/layman} \
/etc/make.profile
eend $? "Cann't fix make.profile link"
NEED_INFO=1
fi
if [[ -n "${NEED_INFO}" ]]
then
ewarn "Please reinstall eselect package:"
ewarn " emerge app-admin/eselect"
fi
fi

13
profiles/patches/dev-cpp/gtkmm-2.16.0-for-newest-xulrunner.patch
Unescape View File

@ -1,13 +0,0 @@
diff --git a/gtk/gtkmm/recentinfo.cc b/gtk/gtkmm/recentinfo.cc
index 3d8f7ea..6d0e14b 100644
--- a/gtk/gtkmm/recentinfo.cc
+++ b/gtk/gtkmm/recentinfo.cc
@@ -189,7 +189,7 @@ bool RecentInfo::get_private_hint() const
bool RecentInfo::get_application_info(const Glib::ustring& app_name, Glib::StringArrayHandle& app_exec, guint& count, time_t& time) const
{
- return gtk_recent_info_get_application_info(const_cast<GtkRecentInfo*>(gobj()), app_name.c_str(), const_cast<gchar**>((app_exec).data()), &(count), &(time));
+ return gtk_recent_info_get_application_info(const_cast<GtkRecentInfo*>(gobj()), app_name.c_str(), const_cast<const gchar**>((app_exec).data()), &(count), &(time));
}
Glib::ustring RecentInfo::last_application() const

17
profiles/patches/dev-lang/python-2.7-env_set.sh
Unescape View File

@ -1,17 +0,0 @@
if [[ ${EBUILD_PHASE} == postinst ]]
then
if [[ -e /etc/env.d/python/config ]]
then
if grep -q python2\.6 /etc/env.d/python/config ||
grep -q python2\.5 /etc/env.d/python/config
then
if [[ -x /usr/bin/eselect ]]
then
eselect python set python2.7
else
echo python2.7 >/etc/env.d/python/config
fi
fi
fi
fi

6
profiles/patches/dev-vcs/git-1-initd.sh
Unescape View File

@ -1,6 +0,0 @@
post_src_install()
{
# fix init.d/git-daemon for force stop git-daemon
sed -ri '/\$\{PIDFILE\}$/ {N;s/(\$\{PIDFILE\})(\n\teend \$)\?/\1\n\tres=$?\n\tpkill -f git-daemon.pid\2res/}' ${D}/etc/init.d/git-daemon
return 0;
}

5
profiles/patches/kde-misc/networkmanagement-0.9.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == postinst ]]
then
einfo "Fix files containt of net-misc/networkmanager"
sed -i '/plasma-applet-networkmanagement.desktop/d' ${EROOT}/var/db/pkg/net-misc/networkmanager-0.9*/CONTENTS
fi

5
profiles/patches/media-gfx/geeqie-1-fix_gqview.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == postinst ]]
then
einfo "Fix files containt of media-gfx/gqview"
sed -i '/calculate-imageview.desktop/d' ${EROOT}/var/db/pkg/media-gfx/gqview/gqview-2.1.5/CONTENTS
fi

5
profiles/patches/net-dns/bind-9.7-8-init.d-fix.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == preinst ]]
then
sed -ri 's/(need net)/\1\n\tafter ldap/' ${D}/etc/init.d/named
fi

12
profiles/patches/net-dns/bind-9.7.1-use_depricated.patch
Unescape View File

@ -1,12 +0,0 @@
diff --git a/bin/named/ldapdb.c b/bin/named/ldapdb.c
index 69b1681..020e817 100644
--- a/bin/named/ldapdb.c
+++ b/bin/named/ldapdb.c
@@ -48,6 +48,7 @@
#include <named/globals.h>
#include <named/log.h>
+#define LDAP_DEPRECATED 1
#include <ldap.h>
#include "ldapdb.h"

5
profiles/patches/net-im/ejabberd-2.1.5-init.d-fix.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == preinst ]]
then
sed -ri 's/(use dns)/\1\n\tafter ldap/' ${D}/etc/init.d/ejabberd
fi

5
profiles/patches/net-im/ejabberd-2.1.8-20-init.d-fix.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == preinst ]]
then
sed -ri 's/(use dns)/\1\n\tafter ldap/' ${D}/etc/init.d/ejabberd
fi

11
profiles/patches/net-nds/openldap-provide-ldap.sh
Unescape View File

@ -1,11 +0,0 @@
if [[ ${EBUILD_PHASE} == postinst ]]
then
if [[ -f ${ROOT}/etc/init.d/slapd ]]
then
# find ldap service in depend section, and if it is absend then append 'provide ldap'
ebegin "Fix /etc/init.d/slapd"
sed -ri '/depend/ {:b;s/\bldap\b/&/;te;s/[}]/&/;tr;N;bb;:r;s/\}/\tprovide ldap\n\}/;:e}' ${ROOT}/etc/init.d/slapd
eend 0
fi
fi

5
profiles/patches/sys-apps/openrc-fix_content.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == setup ]]
then
einfo "Fix files containt of previous openrc"
sed -i '/fbcondecor/d' ${EROOT}/var/db/pkg/sys-apps/openrc-*/CONTENTS
fi

5
profiles/patches/sys-auth/thinkfinger-0.3-udev-fix.sh
Unescape View File

@ -1,5 +0,0 @@
if [[ ${EBUILD_PHASE} == postinst ]]
then
sed -ri 's/SYSFS/ATTRS/gi' ${ROOT}/etc/udev/rules.d/60-thinkfinger.rules
fi

8
profiles/patches/sys-devel/gcc-4-default_set.sh
Unescape View File

@ -1,8 +0,0 @@
# autoswitch to new gcc
if [[ ${EBUILD_PHASE} == postinst ]]
then
einfo "The current gcc config will be automatically switch to the newly"
einfo "installed gcc version ${GCC_CONFIG_VER}"
gcc-config ${CTARGET}-${GCC_CONFIG_VER} &>/dev/null
fi

182
profiles/patches/sys-kernel/gentoo-sources-2.6.31-aufs2-standalone.patch
Unescape View File

@ -1,182 +0,0 @@
aufs2 standalone patch for linux-2.6.
diff --git a/fs/namei.c b/fs/namei.c
index dcedad1..728a39b 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -337,6 +337,7 @@ int deny_write_access(struct file * file)
return 0;
}
+EXPORT_SYMBOL(deny_write_access);
/**
* path_get - get a reference to a path
@@ -1228,6 +1229,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
return ERR_PTR(err);
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
+EXPORT_SYMBOL(lookup_hash);
int __lookup_one_len(const char *name, struct qstr *this,
struct dentry *base, int len)
@@ -1250,6 +1252,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
this->hash = end_name_hash(hash);
return 0;
}
+EXPORT_SYMBOL(__lookup_one_len);
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
index 7230787..8269b66 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -39,6 +39,7 @@
/* spinlock for vfsmount related operations, inplace of dcache_lock */
__cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
+EXPORT_SYMBOL(vfsmount_lock);
static int event;
static DEFINE_IDA(mnt_id_ida);
diff --git a/fs/open.c b/fs/open.c
index dd98e80..04b9aad 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -221,6 +221,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
mutex_unlock(&dentry->d_inode->i_mutex);
return err;
}
+EXPORT_SYMBOL(do_truncate);
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
diff --git a/fs/splice.c b/fs/splice.c
index 0cb8873..0e7b0b9 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1080,6 +1080,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return splice_write(pipe, out, ppos, len, flags);
}
+EXPORT_SYMBOL(do_splice_from);
/*
* Attempt to initiate a splice from a file to a pipe.
@@ -1105,6 +1106,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
+EXPORT_SYMBOL(do_splice_to);
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index b8186ba..42208d8 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -513,6 +513,7 @@ found:
return -EPERM;
}
+EXPORT_SYMBOL(devcgroup_inode_permission);
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 4732f5e..6fa13dd 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -320,6 +320,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
MAY_EXEC, FILE_MMAP);
return 0;
}
+EXPORT_SYMBOL(ima_file_mmap);
/**
* ima_bprm_check - based on policy, collect/store measurement.
diff --git a/security/security.c b/security/security.c
index dc7674f..b309f88 100644
--- a/security/security.c
+++ b/security/security.c
@@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
return 0;
return security_ops->path_mkdir(path, dentry, mode);
}
+EXPORT_SYMBOL(security_path_mkdir);
int security_path_rmdir(struct path *path, struct dentry *dentry)
{
@@ -393,6 +394,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry)
return 0;
return security_ops->path_rmdir(path, dentry);
}
+EXPORT_SYMBOL(security_path_rmdir);
int security_path_unlink(struct path *path, struct dentry *dentry)
{
@@ -400,6 +402,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry)
return 0;
return security_ops->path_unlink(path, dentry);
}
+EXPORT_SYMBOL(security_path_unlink);
int security_path_symlink(struct path *path, struct dentry *dentry,
const char *old_name)
@@ -408,6 +411,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry,
return 0;
return security_ops->path_symlink(path, dentry, old_name);
}
+EXPORT_SYMBOL(security_path_symlink);
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
@@ -416,6 +420,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
return 0;
return security_ops->path_link(old_dentry, new_dir, new_dentry);
}
+EXPORT_SYMBOL(security_path_link);
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry)
@@ -426,6 +431,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
return security_ops->path_rename(old_dir, old_dentry, new_dir,
new_dentry);
}
+EXPORT_SYMBOL(security_path_rename);
int security_path_truncate(struct path *path, loff_t length,
unsigned int time_attrs)
@@ -434,6 +440,7 @@ int security_path_truncate(struct path *path, loff_t length,
return 0;
return security_ops->path_truncate(path, length, time_attrs);
}
+EXPORT_SYMBOL(security_path_truncate);
#endif
int security_inode_create(struct inode *dir, struct dentry *dentry, int mode)
@@ -505,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return security_ops->inode_readlink(dentry);
}
+EXPORT_SYMBOL(security_inode_readlink);
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -519,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return security_ops->inode_permission(inode, mask);
}
+EXPORT_SYMBOL(security_inode_permission);
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -619,6 +628,7 @@ int security_file_permission(struct file *file, int mask)
{
return security_ops->file_permission(file, mask);
}
+EXPORT_SYMBOL(security_file_permission);
int security_file_alloc(struct file *file)
{

25020
profiles/patches/sys-kernel/gentoo-sources-2.6.31-aufs2.patch
View File

File diff suppressed because it is too large Load Diff

12
profiles/patches/sys-kernel/gentoo-sources-2.6.31_x86_need-for-aufs2.patch
Unescape View File

@ -1,12 +0,0 @@
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
@@ -8,7 +8,7 @@
#ifndef _ASM_GENERIC_INT_LL64_H
#define _ASM_GENERIC_INT_LL64_H
-#include <asm/bitsperlong.h>
+#include <asm-generic/bitsperlong.h>
#ifndef __ASSEMBLY__
/*

130
profiles/patches/sys-power/nut-2.4.1-udev_fixrules.patch
Unescape View File

@ -1,130 +0,0 @@
diff --git a/scripts/udev/nut-usbups.rules b/scripts/udev/nut-usbups.rules
index b43d324..041a95d 100644
--- a/scripts/udev/nut-usbups.rules
+++ b/scripts/udev/nut-usbups.rules
@@ -3,90 +3,90 @@
ACTION!="add", GOTO="nut-usbups_rules_end"
SUBSYSTEM=="usb_device", GOTO="nut-usbups_rules_real"
SUBSYSTEM=="usb", GOTO="nut-usbups_rules_real"
-BUS!="usb", GOTO="nut-usbups_rules_end"
+SUBSYSTEM!="usb", GOTO="nut-usbups_rules_end"
LABEL="nut-usbups_rules_real"
# Krauler UP-M500VA - blazer_usb
-SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="nut"
# Hewlett Packard
# HP R/T 2200 INTL (like SMART2200RMXL2U) - usbhid-ups
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f0a", MODE="664", GROUP="nut"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f0a", MODE="664", GROUP="nut"
# MGE Office Protection Systems, prev. MGE UPS Systems
# various models - usbhid-ups
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="nut"
# various models - usbhid-ups
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="nut"
# Belkin
# F6H375-USB - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0375", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0375", MODE="664", GROUP="nut"
# F6C550-AVR - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0551", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="nut"
# F6C1500-TW-RK - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0751", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="nut"
# F6C900-UNV - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0900", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="nut"
# F6C100-UNV - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0910", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="nut"
# F6C120-UNV - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0912", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="nut"
# F6C800-UNV - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0980", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="nut"
# F6C1100-UNV, F6C1200-UNV - usbhid-ups
-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="1100", MODE="664", GROUP="nut"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="nut"
# APC
# various models - usbhid-ups
-SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="nut"
+ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="nut"
# Powerware
# various models - bcmxcp_usb
-SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="nut"
# Agiler UPS - blazer_usb
-SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="nut"
+ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="nut"
# Belkin F6C1200-UNV - blazer_usb
-SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="nut"
# various models - bcmxcp_usb
-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0002", MODE="664", GROUP="nut"
+ATTR{idVendor}=="06da", ATTR{idProduct}=="0002", MODE="664", GROUP="nut"
# Mustek Powermust - blazer_usb
-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0003", MODE="664", GROUP="nut"
+ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="nut"
# various models - usbhid-ups
-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="ffff", MODE="664", GROUP="nut"
+ATTR{idVendor}=="06da", ATTR{idProduct}=="ffff", MODE="664", GROUP="nut"
# Cyber Power Systems
# 900AVR/BC900D, CP1200AVR/BC1200D - usbhid-ups
-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0005", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="nut"
# Dynex DX-800U? - usbhid-ups
-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0501", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="nut"
# Sweex 1000VA - richcomm_usb
-SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="nut"
# TrippLite
# e.g. OMNIVS1000, SMART550USB, ... - tripplite_usb
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="nut"
# e.g. TrippLite AVR550U - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1003", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="nut"
# e.g. TrippLite AVR750U - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1007", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="1007", MODE="664", GROUP="nut"
# e.g. TrippLite OMNI1000LCD - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2005", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="nut"
# e.g. TrippLite OMNI900LCD - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2007", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2007", MODE="664", GROUP="nut"
# e.g. TrippLite smart2200RMXL2U - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3012", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="nut"
# e.g. ? - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3014", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3014", MODE="664", GROUP="nut"
# e.g. TrippLite SmartOnline SU1500RTXL2UA (older unit?) - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4001", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4001", MODE="664", GROUP="nut"
# e.g. TrippLite SmartOnline SU6000RT4U? - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4002", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="nut"
# e.g. TrippLite SmartOnline SU1500RTXL2ua - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4003", MODE="664", GROUP="nut"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="nut"
# Unitek Alpha 1200Sx - blazer_usb
-SYSFS{idVendor}=="0f03", SYSFS{idProduct}=="0001", MODE="664", GROUP="nut"
+ATTR{idVendor}=="0f03", ATTR{idProduct}=="0001", MODE="664", GROUP="nut"
# Ablerex 625L USB - blazer_usb
-SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="nut"
+ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="nut"
LABEL="nut-usbups_rules_end"

10
profiles/patches/x11-apps/xinit-1.3-startDM.sh
Unescape View File

@ -1,10 +0,0 @@
# problem detect with sys-apps/openrc-0.8.3-r1
if [[ ${EBUILD_PHASE} == preinst ]]
then
# when the xinit runs by start-stop-daemon, the console is running start-stop-daemon
# begins to perceive the bad typing, adding redirect /dev/null to stdin resolve this
# problem
# sed adds '</dev/null' to call start-stop-daemon of startDM.sh
sed -ri 's/(\$\{START_STOP_ARGS\})( \|\|)/\1 <\/dev\/null\2/' ${D}/etc/X11/startDM.sh
fi

9
profiles/patches/x11-misc/glipper-2-datadir.patch
Unescape View File

@ -1,9 +0,0 @@
diff --git a/glipper/defs.py b/glipper/defs.py
index 3f41882..38be8bd 100644
--- a/glipper/defs.py
+++ b/glipper/defs.py
@@ -1,3 +1,3 @@
# Variables are filled in by setup.py. Modifications will be overwritten.
-DATA_DIR = ""
+DATA_DIR = "/usr/share"
VERSION = "2.1" #version here is only for running uninstalled

17
profiles/patches/x11-misc/slim-1.3.1-fix-restart.patch
Unescape View File

@ -1,17 +0,0 @@
diff --git a/slim-1.3.1/app.cpp b/slim-1.3.1/app.cpp
index 83ae947..e07f077 100644
--- a/slim-1.3.1/app.cpp
+++ b/slim-1.3.1/app.cpp
@@ -959,9 +959,9 @@ void App::StopServer() {
signal(SIGALRM, SIG_DFL);
// Catch X error
- XSetIOErrorHandler(IgnoreXIO);
- if(!setjmp(CloseEnv) && Dpy)
- XCloseDisplay(Dpy);
+ //XSetIOErrorHandler(IgnoreXIO);
+ //if(!setjmp(CloseEnv) && Dpy)
+ // XCloseDisplay(Dpy);
// Send HUP to process group
errno = 0;

1
profiles/templates/3.1/2_ac_install_merge/Depends/ejabberd
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge(net-im/ejabberd)!= merge=sys-apps/openrc

1
profiles/templates/3.1/2_ac_install_merge/dev-lang/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/2_ac_install_merge/dev-lang/python/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()!=&&pkg(dev-lang/python:2.7)!= append=skip

15
profiles/templates/3.1/2_ac_install_merge/dev-lang/python/python2.7_env
Unescape View File

@ -0,0 +1,15 @@
# Calculate exec=/bin/bash cl_merge_pkg!=
if [[ -e /etc/env.d/python/config ]]
then
if grep -q python2\.6 /etc/env.d/python/config ||
grep -q python2\.5 /etc/env.d/python/config
then
if [[ -x /usr/bin/eselect ]]
then
eselect python set python2.7
else
echo python2.7 >/etc/env.d/python/config
fi
fi
fi

1
profiles/templates/3.1/2_ac_install_merge/dev-vcs/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/2_ac_install_merge/dev-vcs/git/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate path=/etc name=init.d merge()!=&&pkg()!=

5
profiles/templates/3.1/2_ac_install_merge/dev-vcs/git/git-daemon
Unescape View File

@ -0,0 +1,5 @@
# Calculate format=patch
<reg>(ebegin "Starting[\S\s]*?)eend[^\n]+</reg>
<text>\1res=$?
pkill -f git-daemon.pid
eend $res</text>

1
profiles/templates/3.1/2_ac_install_merge/kde-misc/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/2_ac_install_merge/kde-misc/networkmanagement/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()>=0.9&&pkg()>=0.9

5
profiles/templates/3.1/2_ac_install_merge/kde-misc/networkmanagement/fix_networkmanager
Unescape View File

@ -0,0 +1,5 @@
# Calculate exec=/bin/bash cl_merge_pkg!=
echo "Fix files containt of net-misc/networkmanager"
sed -i '/plasma-applet-networkmanagement.desktop/d' ${EROOT}/var/db/pkg/net-misc/networkmanager-0.9*/CONTENTS
true

3
profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/rc.conf
Unescape View File

@ -12,3 +12,6 @@ rc_hostname_before="net.lo"
#?pkg(net-dns/bind)!=&&pkg(net-nds/openldap)!=#
rc_named_after="ldap"
#pkg#
#?pkg(net-im/ejabberd)!=&&pkg(net-nds/openldap)!=#
rc_jabberd_after="ldap"
#pkg#

1
profiles/templates/3.1/2_ac_install_merge/sys-devel/gcc/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()!=&&pkg()>=4 append=skip

6
profiles/templates/3.1/2_ac_install_merge/sys-devel/gcc/gcc_default_set
Unescape View File

@ -0,0 +1,6 @@
# Calculate exec=/bin/bash cl_merge_pkg!=
#
# autoswitch to new gcc
echo "The current gcc config will be automatically switch to the newly"
echo "installed gcc version ${GCC_CONFIG_VER}"
gcc-config ${CTARGET}-${GCC_CONFIG_VER} &>/dev/null

3
profiles/templates/3.1/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
Unescape View File

@ -0,0 +1,3 @@
# Calculate format=patch
<reg>\$\{START_STOP_ARGS\} \|\|</reg>
<text>${START_STOP_ARGS} &lt;/dev/null ||</text>

2
profiles/templates/3.1/6_ac_install_patch/.calculate_directory
Unescape View File

@ -1 +1 @@
# Calculate append=skip env=install
# Calculate append=skip env=install cl_ver>=3.1.4&&ac_install_patch==on

1
profiles/templates/3.1/6_ac_install_patch/app-text/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/app-text/wgetpaste/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()!= append=skip

190
profiles/templates/3.1/6_ac_install_patch/app-text/wgetpaste/calculate_wgetpaste.patch
Unescape View File

@ -0,0 +1,190 @@
# Calculate format=diff merge()>=2.20
diff -urN a/wgetpaste b/wgetpaste
--- a/wgetpaste 2012-05-05 23:15:32.000000000 +0400
+++ b/wgetpaste 2012-06-29 12:14:53.482724926 +0400
@@ -6,6 +6,8 @@
VERSION="2.20"
+DEFAULT_SERVICE="calculate"
+
# don't inherit LANGUAGE from the env
unset LANGUAGE
@@ -14,7 +16,7 @@
N=$'\n'
### services
-SERVICES="ca codepad dpaste gists poundpython"
+SERVICES="ca codepad dpaste gists poundpython calculate"
# ca
ENGINE_ca=ca
URL_ca="http://pastebin.ca/"
@@ -39,6 +41,17 @@
ENGINE_tinyurl=tinyurl
URL_tinyurl="http://tinyurl.com/ api-create.php"
REGEX_RAW_tinyurl='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2|'
+# calculate
+ENGINE_calculate=calculate
+if [[ "$LANG" =~ 'ru_RU' ]]; then
+ URL_calculate="http://pastebin.calculate-linux.ru"
+else
+ URL_calculate="http://pastebin.calculate-linux.org"
+fi
+DEFAULT_LANGUAGE_calculate="Text"
+DEFAULT_PARENT_calculate=""
+DEFAULT_PRIVATE_calculate=0
+SIZE_calculate="25000 25%kB"
### engines
# ca
@@ -49,12 +62,12 @@
EXPIRATIONS_ca="Never 5%minutes 10%minutes 15%minutes 30%minutes 45%minutes 1%hour 2%hours \
4%hours 8%hours 12%hours 1%day 2%days 3%days 1%week 2%weeks 3%weeks 1%month 2%months \
3%months 4%months 5%months 6%months 1%year"
-POST_ca="s=Submit+Post name description type expiry % content"
+POST_ca="s=Submit+Post name description type expiry % % % content"
REGEX_URL_ca='s|^.*content="[0-9]*;\(http://[^/]*/[0-9]*\)".*$|\1|p'
REGEX_RAW_ca='s|^\(http://[^/]*/\)\([0-9]*\)$|\1raw/\2|'
# codepad
LANGUAGES_codepad="C C++ D Haskell Lua OCaml PHP Perl Plain%Text Python Ruby Scheme Tcl"
-POST_codepad="submit % % lang % % code"
+POST_codepad="submit % % lang % % % % code"
REGEX_URL_codepad='s|^--.*\(http://codepad.org/[^ ]\+\)|\1|p'
REGEX_RAW_codepad='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2/raw.rb|'
# dpaste
@@ -64,7 +77,7 @@
Ruby Rhtml Sql Xml"
EXPIRATIONS_dpaste="30%days 30%days%after%last%view"
EXPIRATION_VALUES_dpaste="off on"
-POST_dpaste="submit=Paste+it poster title language hold % content"
+POST_dpaste="submit=Paste+it poster title language hold % % % content"
REGEX_RAW_dpaste='s|^\(http://[^/]*/\)[^0-9]*\([0-9]*/\)$|\1\2plain/|'
# gists
LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly
@@ -113,8 +126,24 @@
javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
-POST_lodgeit="submit=Paste! % % language % % code"
+POST_lodgeit="submit=Paste! % % language % % % % code"
REGEX_RAW_lodgeit='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
+# calculate
+LANGUAGES_calculate="Apache Bash Batch Boo C C# C++ Clojure Creole_Wiki CSS \
+CSV D Debian_control-files Django_Jinja_Templates Dylan Erlang eRuby_rhtml GAS GCC_Messages \
+Genshi_Templates Gettext_catalogs GL_Shader_language Haskell HTML INI_File Interactive_Ruby IO \
+IRC_Logs Java javac_Messages JavaScript JSP Lighttpd Literate_Haskell LLVM Lua Mako_Templates Matlab \
+Matlab_Session MiniD Multi-File Myghty_Templates MySQL Nasm Nginx Object-Pascal OCaml Perl PHP \
+PHP_(inline) Povray Python Python_Console_Sessions Python_Tracebacks reStructuredText Ruby Scala \
+Scheme Smalltalk Smarty sources.list SQL SquidConf TeX_LaTeX Text Unified_Diff Vim XML XSLT YAML"
+LANGUAGE_VALUES_calculate="apache bash bat boo c csharp cpp clojure creole css csv d control html+django \
+dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini irb io irc java \
+javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
+html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
+scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
+POST_calculate="submit=paste! % % language % parent private % text"
+REGEX_RAW_calculate='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
+
### errors
die() {
@@ -303,6 +332,9 @@
-s, --service SERVICE set service to use (defaults to "$DEFAULT_SERVICE")
-e, --expiration EXPIRATION set when it should expire (defaults to "$DEFAULT_EXPIRATION")
+ -p, --parent PARENT set parent paste (defaults to "$DEFAULT_PARENT", make use id paste) (Calculate pastebin option)
+ -P, --private PRIVATE set private status (defaults to "$DEFAULT_PRIVATE") (Calculate pastebin option)
+
-S, --list-services list supported pastebin services
-L, --list-languages list languages supported by the specified service
-E, --list-expiration list expiration setting supported by the specified service
@@ -390,6 +422,18 @@
done | sort
}
+showprivate() {
+ local p priv d
+ priv=PRIVATE_$ENGINE
+ [[ -n $COMPLETIONS ]] && printlist ${!priv} | sort && exit 0
+ echo "Private supported by $(getrecipient) (case sensitive):"
+ [[ -z ${!priv} ]] && echo "$N\"$ENGINE\" has no support for setting language." >&2 && exit 1
+ for p in ${!priv}; do
+ [[ ${p//\%/ } = $DEFAULT_PRIVATE ]] && d="*" || d=" "
+ echo " $d${p//\%/ }"
+ done | sort
+}
+
showexpirations() {
local e expiration info d
expiration=EXPIRATIONS_$ENGINE
@@ -443,7 +487,7 @@
post=POST_$ENGINE
if [[ -n ${!post} ]]; then
nr=${!post//[^ ]}
- [[ 6 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
+ [[ 8 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
extra=${!post%% *}
[[ '%' = $extra ]] || echo -n "$extra&"
e() {
@@ -456,7 +500,7 @@
post=${post#$f }
done
}
- e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION CVT_TABS INPUT
+ e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION PARENT PRIVATE CVT_TABS INPUT
elif [[ function == $(type -t json_$ENGINE) ]]; then
json_$ENGINE "$DESCRIPTION" "$LANGUAGE" "$INPUT"
else
@@ -559,6 +603,16 @@
-L | --list-languages )
LISTLANGUAGES=0
;;
+ -p | --parent )
+ requiredarg "$@"
+ PARENTSET=0
+ PARENT="$2"
+ ;;
+ -P | --private )
+ requiredarg "$@"
+ PRIVATESET=0
+ PRIVATE="$2"
+ ;;
-n | --nick )
requiredarg "$@"
NICK=$(escape "$2")
@@ -636,12 +690,16 @@
DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
DEFAULT_SERVICE=${DEFAULT_SERVICE:-gists}
DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
+DEFAULT_PARENT=${DEFAULT_PARENT:-''}
+DEFAULT_PRIVATE=${DEFAULT_PRIVATE:-0}
DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
ENGINE=ENGINE_$SERVICE
ENGINE="${!ENGINE}"
default="DEFAULT_NICK_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_NICK=${!default}
default="DEFAULT_LANGUAGE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_LANGUAGE=${!default}
+default="DEFAULT_PARENT_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PARENT=${!default}
+default="DEFAULT_PRIVATE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PRIVATE=${!default}
default="DEFAULT_EXPIRATION_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_EXPIRATION=${!default}
NICK=${NICK:-$(escape "${DEFAULT_NICK}")}
[[ -z $SOURCE ]] && SOURCE="stdin"
@@ -663,6 +721,10 @@
LANGUAGE=${LANGUAGE:-${DEFAULT_LANGUAGE}}
verifylanguage
LANGUAGE=$(escape "$LANGUAGE")
+PARENT=${PARENT:-${DEFAULT_PARENT}}
+PARENT=$(escape "$PARENT")
+PRIVATE=${PRIVATE:-${DEFAULT_PRIVATE}}
+PRIVATE=$(escape "$PRIVATE")
EXPIRATION=${EXPIRATION:-${DEFAULT_EXPIRATION}}
verifyexpiration
EXPIRATION=$(escape "$EXPIRATION")
@@ -812,6 +874,7 @@
[[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
if [[ -f $TMPF ]]; then
postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"."
+ [[ $LANG =~ ru_RU ]] && enconv $TMPF
WGETARGS="--post-file=$TMPF"
else
# fall back to using --post-data if the temporary file could not be created

1
profiles/templates/3.1/6_ac_install_patch/dev-python/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/dev-python/python-twitter/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()>=0.8.1 append=skip

14
profiles/templates/3.1/6_ac_install_patch/dev-python/python-twitter/message_len.patch
Unescape View File

@ -0,0 +1,14 @@
# Calculate format=diff
diff --git a/twitter.py b/twitter.py
index 5e58582..c411241 100755
--- a/twitter.py
+++ b/twitter.py
@@ -65,7 +65,7 @@ except ImportError:
import oauth2 as oauth
-CHARACTER_LIMIT = 140
+CHARACTER_LIMIT = 300
# A singleton representing a lazily instantiated FileCache.
DEFAULT_CACHE = object()

1
profiles/templates/3.1/6_ac_install_patch/gnome-base/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/gnome-base/gdm/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()!= append=skip

94
profiles/templates/3.1/6_ac_install_patch/gnome-base/gdm/user_sort.patch
Unescape View File

@ -0,0 +1,94 @@
# Calculate format=diff merge(gnome-base/gdm)>=2.20&&merge(gnome-base/gdm)<=3
diff --git a/gui/gdmuser.c b/gui/gdmuser.c
index 2dff3f6..27a169f 100644
--- a/gui/gdmuser.c
+++ b/gui/gdmuser.c
@@ -232,13 +232,32 @@ gdm_sort_func (gpointer d1, gpointer d2)
{
GdmUser *a = d1;
GdmUser *b = d2;
+ char *astr;
+ char *bstr;
if (!d1 || !d2)
return (0);
- return (strcmp (a->login, b->login));
+ astr = (a->gecos && strcmp(a->gecos, "") != 0 ) ? a->gecos : a->login;
+ bstr = (b->gecos && strcmp(b->gecos, "") != 0 ) ? b->gecos : b->login;
+ if(astr == a->gecos && bstr == b->gecos && !strcmp(astr,bstr)) {
+ return (strcmp (a->login, b->login));
+ }
+
+ return (strcmp (astr, bstr));
}
+static gint
+gdm_sort_login_func (gpointer d1, gpointer d2)
+{
+ GdmUser *a = d1;
+ GdmUser *b = d2;
+
+ if (!d1 || !d2)
+ return (0);
+
+ return (strcmp (a->login, b->login));
+}
static gboolean
setup_user (struct passwd *pwent,
@@ -267,7 +286,7 @@ setup_user (struct passwd *pwent,
defface, read_faces);
if ((user) &&
- (! g_list_find_custom (*users, user, (GCompareFunc) gdm_sort_func))) {
+ (! g_list_find_custom (*users, user, (GCompareFunc) gdm_sort_login_func))) {
cnt++;
*users = g_list_insert_sorted (*users, user,
(GCompareFunc) gdm_sort_func);
diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c
index 574a10b..d9f2628 100644
--- a/gui/greeter/greeter_item_ulist.c
+++ b/gui/greeter/greeter_item_ulist.c
@@ -187,14 +187,23 @@ greeter_populate_user_list (GtkTreeModel *tm)
GdmUser *usr = li->data;
GtkTreeIter iter = {0};
char *label;
+ char *gecos;
+ char *login;
char *name;
gboolean active;
+ login = gdm_common_text_to_escaped_utf8 (usr->login);
+
if (usr->gecos && strcmp (usr->gecos, "") != 0) {
- name = gdm_common_text_to_escaped_utf8 (usr->gecos);
- } else {
- name = gdm_common_text_to_escaped_utf8 (usr->login);
+ gecos = gdm_common_text_to_escaped_utf8 (usr->gecos);
+ name = g_strdup_printf ("%s\n%s",gecos,login);
+ g_free (gecos);
}
+ else {
+ name = g_strdup (login);
+ }
+
+ g_free (login);
if (g_hash_table_lookup (displays_hash, usr->login))
active = TRUE;
@@ -202,12 +211,11 @@ greeter_populate_user_list (GtkTreeModel *tm)
active = FALSE;
if (active) {
- label = g_strdup_printf ("<b>%s</b>\n <i><small>%s</small></i>",
+ label = g_strdup_printf ("%s <i><small>%s</small></i>",
name,
_("Already logged in"));
} else {
- label = g_strdup_printf ("<b>%s</b>\n",
- name);
+ label = g_strdup (name);
}
g_free (name);

1
profiles/templates/3.1/6_ac_install_patch/kde-base/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/kde-base/kdelibs/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()>=4

18
profiles/templates/3.1/6_ac_install_patch/kde-base/kdelibs/inherit_generic_fallback.patch
Unescape View File

@ -0,0 +1,18 @@
# Calculate format=diff
diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
index ef54230..af3ef94 100644
--- a/kdeui/icons/kiconloader.cpp
+++ b/kdeui/icons/kiconloader.cpp
@@ -1041,6 +1041,10 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
}
#endif
if (genericFallback)
+ {
+ // restore genericFallback flag
+ genericFallback = name.endsWith(QLatin1String("-x-generic"));
// we already tested the base name
break;
+ }
int rindex = currentName.lastIndexOf('-');
if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc

20
profiles/templates/3.1/6_ac_install_patch/kde-base/kdelibs/samba-icon.patch
Unescape View File

@ -0,0 +1,20 @@
# Calculate format=diff
--- kdelibs-4.3.1.orig/kdecore/services/kfoldermimetype.cpp
+++ kdelibs-4.3.1/kdecore/services/kfoldermimetype.cpp
@@ -77,11 +77,11 @@ QString KFolderMimeTypePrivate::iconName( const KUrl& _url ) const
// There are also other directories with 0 size, such as /proc, that may
// be mounted, but those are unlikely to contain .directory (and checking
// this would require KMountPoint from kio).
- KDE_struct_stat buff;
- if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
- && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
- return KMimeTypePrivate::iconName( _url );
- }
+ //KDE_struct_stat buff;
+ //if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
+ // && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
+ // return KMimeTypePrivate::iconName( _url );
+ //}
KUrl u( _url );
u.addPath( ".directory" );

1
profiles/templates/3.1/6_ac_install_patch/media-gfx/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/media-gfx/gimp/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()!= append=skip

26
profiles/templates/3.1/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.2.patch
Unescape View File

@ -0,0 +1,26 @@
# Calculate format=patch merge(media-gfx/gimp)>=2.8.2&&merge(media-gfx/gimp)<2.8.4
diff -Naur a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
--- a/app/config/gimpguiconfig.c 2012-03-12 23:18:06.000000000 +0400
+++ b/app/config/gimpguiconfig.c 2012-05-18 12:47:30.000000000 +0400
@@ -197,7 +197,7 @@
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
"toolbox-wilber",
TOOLBOX_WILBER_BLURB,
- TRUE,
+ FALSE,
GIMP_PARAM_STATIC_STRINGS);
path = gimp_config_build_data_path ("themes");
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
diff -Naur a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
--- a/app/widgets/gimpcairo-wilber.c 2012-03-12 23:18:07.000000000 +0400
+++ b/app/widgets/gimpcairo-wilber.c 2012-05-18 12:47:12.000000000 +0400
@@ -37,8 +37,7 @@
* It works best if you combine all paths into one. Inkscape has a
* function to do that.
*/
-static const gchar wilber_path[] =
- "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
+static const gchar wilber_path[] = "";
static cairo_path_t *wilber_cairo_path = NULL;
static gdouble wilber_x1, wilber_y1;

28
profiles/templates/3.1/6_ac_install_patch/media-gfx/gimp/remove_wilber-2.8.4.patch
Unescape View File

@ -0,0 +1,28 @@
# Calculate format=diff merge(media-gfx/gimp)>=2.8.4
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index a1fc464..223762c 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -197,7 +197,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
"toolbox-wilber",
TOOLBOX_WILBER_BLURB,
- TRUE,
+ FALSE,
GIMP_PARAM_STATIC_STRINGS);
path = gimp_config_build_data_path ("themes");
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
index 62fe06f..d991adb 100644
--- a/app/widgets/gimpcairo-wilber.c
+++ b/app/widgets/gimpcairo-wilber.c
@@ -37,8 +37,7 @@
* It works best if you combine all paths into one. Inkscape has a
* function to do that.
*/
-static const gchar wilber_path[] =
- "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
+static const gchar wilber_path[] = "";
static cairo_path_t *wilber_cairo_path = NULL;
static gdouble wilber_x1, wilber_y1;

1
profiles/templates/3.1/6_ac_install_patch/media-gfx/splashutils/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate merge()>=1.5.4.4 append=skip

113
profiles/templates/3.1/6_ac_install_patch/media-gfx/splashutils/text_align.patch
Unescape View File

@ -0,0 +1,113 @@
# Calculate format=diff
diff --git a/splashutils-1.5.4.4/docs/theme_format b/splashutils-1.5.4.4/docs/theme_format
index 2cc629b..8932583 100644
--- a/splashutils-1.5.4.4/docs/theme_format
+++ b/splashutils-1.5.4.4/docs/theme_format
@@ -91,6 +91,9 @@ that they enclose.
* text_y=<n>
The y coordinate of the main system message.
+* text_align [left|middle|right] [top|middle|bottom]
+ Text align of the main system message.
+
* text_size=<n>
The size of the font used to render the main system message.
diff --git a/splashutils-1.5.4.4/src/parse.c b/splashutils-1.5.4.4/src/parse.c
index ad7676d..0728419 100644
--- a/splashutils-1.5.4.4/src/parse.c
+++ b/splashutils-1.5.4.4/src/parse.c
@@ -20,7 +20,7 @@
struct cfg_opt {
char *name;
enum {
- t_int, t_path, t_box, t_icon, t_rect, t_color, t_fontpath,
+ t_int, t_path, t_box, t_icon, t_rect, t_color, t_fontpath, t_align,
t_type_open, t_type_close, t_anim, t_text, t_textbox_open, t_textbox_close,
} type;
void *val;
@@ -28,6 +28,7 @@ struct cfg_opt {
int line = 0;
u16 text_x, text_y;
+u8 text_align = 0;
u16 text_size;
color text_color;
char *text_font;
@@ -147,6 +148,10 @@ struct cfg_opt opts[] =
.type = t_fontpath,
.val = &text_font },
+ { .name = "text_align",
+ .type = t_align,
+ .val = &text_align },
+
{ .name = "text",
.type = t_text,
.val = NULL },
@@ -216,6 +221,44 @@ static bool skip_nonwhitespace(char **buf, bool req)
return true;
}
+static void parse_align(char *t, struct cfg_opt opt)
+{
+ (*(u8*)opt.val) = 0;
+ /* Parse x position */
+
+ if (!strncmp(t, "left", 4)) {
+ (*(u8*)opt.val) |= F_HS_LEFT;
+ t += 4;
+ } else if (!strncmp(t, "right", 5)) {
+ (*(u8*)opt.val) |= F_HS_RIGHT;
+ t += 5;
+ } else if (!strncmp(t, "middle", 6)) {
+ (*(u8*)opt.val) |= F_HS_HMIDDLE;
+ t += 6;
+ } else {
+ parse_error("expected 'left', 'right' or 'middle' instead of '%s'", t);
+ return;
+ }
+
+ if (!skip_whitespace(&t, true))
+ return;
+ /* Parse y position */
+
+ if (!strncmp(t, "top", 3)) {
+ (*(u8*)opt.val) |= F_HS_TOP;
+ t += 3;
+ } else if (!strncmp(t, "bottom", 6)) {
+ (*(u8*)opt.val) |= F_HS_BOTTOM;
+ t += 6;
+ } else if (!strncmp(t, "middle", 6)) {
+ (*(u8*)opt.val) |= F_HS_VMIDDLE;
+ t += 6;
+ } else {
+ parse_error("expected 'top', 'bottom' or 'middle' instead of '%s'", t);
+ (*(u8*)opt.val) |= F_HS_TOP;
+ }
+}
+
static void parse_int(char *t, struct cfg_opt opt)
{
if (*t != '=') {
@@ -1115,7 +1160,7 @@ void add_main_msg()
return;
}
- ct->hotspot = F_HS_LEFT | F_HS_TOP;
+ ct->hotspot = text_align;
ct->style = TTF_STYLE_NORMAL;
ct->x = text_x;
ct->y = text_y;
@@ -1245,6 +1290,11 @@ int parse_cfg(char *cfgfile, stheme_t *theme)
parse_int(t, opts[i]);
break;
+ case t_align:
+ skip_whitespace(&t, false);
+ parse_align(t, opts[i]);
+ break;
+
case t_box:
{
box *tbox = parse_box(t);

1
profiles/templates/3.1/6_ac_install_patch/net-im/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/net-im/choqok/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()>=1.0

16
profiles/templates/3.1/6_ac_install_patch/net-im/choqok/branding.patch
Unescape View File

@ -0,0 +1,16 @@
# Calculate format=diff
diff --git a/microblogs/twitter/twittereditaccount.cpp b/microblogs/twitter/twittereditaccount.cpp
index efea8d5..9f50534 100644
--- a/microblogs/twitter/twittereditaccount.cpp
+++ b/microblogs/twitter/twittereditaccount.cpp
@@ -40,8 +40,8 @@ along with this program; if not, see http://www.gnu.org/licenses/
#include <QCheckBox>
#include <KInputDialog>
-const char * twitterConsumerKey = "VyXMf0O7CvciiUQjliYtYg";
-const char * twitterConsumerSecret = "uD2HvsOBjzt1Vs6SnouFtuxDeHmvOOVwmn3fBVyCw0";
+const char * twitterConsumerKey = "irARiVrv825Fl2oZaYiQA";
+const char * twitterConsumerSecret = "qYZa8Dszrow6vry4iwtSm1zTidnW7ii8IQztgXWZY";
TwitterEditAccountWidget::TwitterEditAccountWidget(TwitterMicroBlog *microblog,
TwitterAccount* account, QWidget* parent)

1
profiles/templates/3.1/6_ac_install_patch/net-im/ejabberd/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()>=2.1.8

266
profiles/templates/3.1/6_ac_install_patch/net-im/ejabberd/mod_logxml.patch
Unescape View File

@ -0,0 +1,266 @@
# Calculate format=diff
diff -uNr ejabberd-2.0.2-beta1.ORIG/src/mod_logxml.erl ejabberd-2.0.2-beta1/src/mod_logxml.erl
--- mod_logxml.erl
+++ mod_logxml.erl
@@ -0,0 +1,261 @@
+%%%----------------------------------------------------------------------
+%%% File : mod_logxml.erl
+%%% Author : Badlop
+%%% Purpose : Log XMPP packets to XML file
+%%% Created :
+%%% Id :
+%%%----------------------------------------------------------------------
+
+-module(mod_logxml).
+-author('badlop@ono.com').
+
+-behaviour(gen_mod).
+
+-export([start/2, init/7, stop/1,
+ send_packet/3, receive_packet/4]).
+
+-include("ejabberd.hrl").
+-include("jlib.hrl").
+
+-define(PROCNAME, ejabberd_mod_logxml).
+
+%% -------------------
+%% Module control
+%% -------------------
+
+start(Host, Opts) ->
+ Logdir = gen_mod:get_opt(logdir, Opts, "/tmp/jabberlogs/"),
+
+ Rd = gen_mod:get_opt(rotate_days, Opts, 1),
+ Rf = case gen_mod:get_opt(rotate_megs, Opts, 10) of
+ no -> no;
+ Rf1 -> Rf1*1024*1024
+ end,
+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, 10) of
+ no -> no;
+ Rp1 -> Rp1*1000
+ end,
+ RotateO = {Rd, Rf, Rp},
+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, 1),
+
+ Timezone = gen_mod:get_opt(timezone, Opts, local),
+
+ Orientation = gen_mod:get_opt(orientation, Opts, [send, recv]),
+ Stanza = gen_mod:get_opt(stanza, Opts, [iq, message, presence, other]),
+ Direction = gen_mod:get_opt(direction, Opts, [internal, vhosts, external]),
+ FilterO = {
+ {orientation, Orientation},
+ {stanza, Stanza},
+ {direction, Direction}},
+ ShowIP = gen_mod:get_opt(show_ip, Opts, false),
+
+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
+ register(gen_mod:get_module_proc(Host, ?PROCNAME),
+ spawn(?MODULE, init, [Host, Logdir, RotateO, CheckRKP,
+ Timezone, ShowIP, FilterO])).
+
+stop(Host) ->
+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+ Proc ! stop,
+ {wait, Proc}.
+
+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
+ Timezone, ShowIP, FilterO).
+
+%% -------------------
+%% Main
+%% -------------------
+
+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
+ Gregorian_day_log, Timezone) ->
+ {RO_days, RO_size, RO_packets} = RotateO,
+
+ Rotate1 = case RO_packets of
+ no -> false;
+ PacketC -> true;
+ _ -> false
+ end,
+
+ Filesize = filelib:file_size(Filename),
+ Rotate2 = if
+ RO_size == no -> false;
+ Filesize >= RO_size -> true;
+ true -> false
+ end,
+
+ Gregorian_day_today = get_gregorian_day(),
+ Rotate3 = if
+ RO_days == no -> false;
+ (Gregorian_day_today - Gregorian_day_log) >= RO_days ->
+ true;
+ true -> false
+ end,
+
+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
+ true ->
+ {IoDevice2, Filename2, Gregorian_day2} =
+ rotate_log(IoDevice, Logdir, Host, Timezone),
+ {IoDevice2, Filename2, Gregorian_day2, 0};
+ false ->
+ {IoDevice, Filename, Gregorian_day_log, PacketC+1}
+ end.
+
+filter(FilterO, E) ->
+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
+ FilterO,
+ {Orientation, From, To, Packet} = E,
+
+ {xmlelement, Stanza_str, _Attrs, _Els} = Packet,
+ Stanza = list_to_atom(Stanza_str),
+
+ Hosts_all = ejabberd_config:get_global_option(hosts),
+ {Host_local, Host_remote} = case Orientation of
+ send -> {From#jid.lserver, To#jid.lserver};
+ recv -> {To#jid.lserver, From#jid.lserver}
+ end,
+ Direction = case Host_remote of
+ Host_local -> internal;
+ _ ->
+ case lists:member(Host_remote, Hosts_all) of
+ true -> vhosts;
+ false -> external
+ end
+ end,
+
+ {lists:all(fun(O) -> O end,
+ [lists:member(Orientation, OrientationO),
+ lists:member(Stanza, StanzaO),
+ lists:member(Direction, DirectionO)]),
+ {Orientation, Stanza, Direction}}.
+
+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
+ Gregorian_day, Timezone, ShowIP, FilterO) ->
+ receive
+ {addlog, E} ->
+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
+ case filter(FilterO, E) of
+ {true, OSD} ->
+ Div = PacketC/CheckRKP,
+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} =
+ case Div==round(Div) of
+ true ->
+ manage_rotate(Host, IoDevice, Filename,
+ Logdir, RotateO, PacketC,
+ Gregorian_day, Timezone);
+ false ->
+ {IoDevice, Filename, Gregorian_day,
+ PacketC+1}
+ end,
+ add_log(IoDevice2, Timezone, ShowIP, E, OSD),
+ {IoDevice2, Filename2, Gregorian_day2, PacketC2};
+ _ ->
+ {IoDevice, Filename, Gregorian_day, PacketC}
+ end,
+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
+ stop ->
+ close_file(IoDevice),
+ ok;
+ _ ->
+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
+ Gregorian_day, Timezone, ShowIP, FilterO)
+ end.
+
+send_packet(FromJID, ToJID, P) ->
+ Host = FromJID#jid.lserver,
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+ Proc ! {addlog, {send, FromJID, ToJID, P}}.
+
+receive_packet(_JID, From, To, P) ->
+ Host = To#jid.lserver,
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+ Proc ! {addlog, {recv, From, To, P}}.
+
+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
+ %%{Orientation, Stanza, Direction} = OSD,
+ LocalJID = case Orientation of
+ send -> From;
+ recv -> To
+ end,
+ LocalIPS = case ShowIP of
+ true ->
+ {UserIP, _Port} = ejabberd_sm:get_user_ip(
+ LocalJID#jid.user,
+ LocalJID#jid.server,
+ LocalJID#jid.resource),
+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
+ false -> ""
+ end,
+ TimestampISO = get_now_iso(Timezone),
+ io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
+ TimestampISO, xml:element_to_string(Packet)]).
+
+%% -------------------
+%% File
+%% -------------------
+
+open_file(Logdir, Host, Timezone) ->
+ TimeStamp = get_now_iso(Timezone),
+ Year = string:substr(TimeStamp, 1, 4),
+ Month = string:substr(TimeStamp, 5, 2),
+ Day = string:substr(TimeStamp, 7, 2),
+ Hour = string:substr(TimeStamp, 10, 2),
+ Min = string:substr(TimeStamp, 13, 2),
+ Sec = string:substr(TimeStamp, 16, 2),
+ S = "-",
+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
+ ".xml"]),
+ Filename = filename:join([Logdir, Logname]),
+
+ Gregorian_day = get_gregorian_day(),
+
+ %% Open file, create if it does not exist, create parent dirs if needed
+ case file:read_file_info(Filename) of
+ {ok, _} ->
+ {ok, IoDevice} = file:open(Filename, [append]);
+ {error, enoent} ->
+ make_dir_rec(Logdir),
+ {ok, IoDevice} = file:open(Filename, [append]),
+ io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
+ io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
+ io:fwrite(IoDevice, "~s~n", ["<log>"])
+ end,
+ {IoDevice, Filename, Gregorian_day}.
+
+close_file(IoDevice) ->
+ io:fwrite(IoDevice, "~s~n", ["</log>"]),
+ file:close(IoDevice).
+
+rotate_log(IoDevice, Logdir, Host, Timezone) ->
+ close_file(IoDevice),
+ open_file(Logdir, Host, Timezone).
+
+make_dir_rec(Dir) ->
+ case file:read_file_info(Dir) of
+ {ok, _} ->
+ ok;
+ {error, enoent} ->
+ DirS = filename:split(Dir),
+ DirR = lists:sublist(DirS, length(DirS)-1),
+ make_dir_rec(filename:join(DirR)),
+ file:make_dir(Dir)
+ end.
+
+%% -------------------
+%% Utils
+%% -------------------
+
+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
+
+get_now_iso(Timezone) ->
+ TimeStamp = case Timezone of
+ local -> calendar:now_to_local_time(now());
+ universal -> calendar:now_to_universal_time(now())
+ end,
+ jlib:timestamp_to_iso(TimeStamp).

1
profiles/templates/3.1/6_ac_install_patch/net-misc/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/net-misc/gwibber/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()>=3.1

8
profiles/templates/3.1/6_ac_install_patch/net-misc/gwibber/branding.patch
Unescape View File

@ -0,0 +1,8 @@
diff --git gwibber/microblog/util/custom.py gwibber/microblog/util/custom.py
new file mode 100644
index 0000000..cc60f14
--- /dev/null
+++ gwibber/microblog/util/custom.py
@@ -0,0 +1,2 @@
+TWITTER_OAUTH_KEY = "vuYyUcgOmNmGAldiX7z2A"
+TWITTER_OAUTH_SECRET = "yf4KHlIHwI3sOBsdJj5XDoNUcsoz7SAGRTsDZ2Qlwf8"

1
profiles/templates/3.1/6_ac_install_patch/net-print/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/net-print/cnijfilter/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()>=3.20

14
profiles/templates/3.1/6_ac_install_patch/net-print/cnijfilter/libpng15.patch
Unescape View File

@ -0,0 +1,14 @@
# Calculate format=diff
diff --git a/cnijfilter/src/bjfimage.c b/cnijfilter/src/bjfimage.c
index 4006f9d..111b4a2 100755
--- a/cnijfilter/src/bjfimage.c
+++ b/cnijfilter/src/bjfimage.c
@@ -1574,7 +1574,7 @@ static short png_image_init( LPBJF_IMAGEINFO lpbjfimage )
goto onErr;
}
- if (setjmp (png_p->jmpbuf))
+ if (setjmp (png_jmpbuf(png_p)))
{
png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
goto onErr;

1
profiles/templates/3.1/6_ac_install_patch/sys-apps/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/sys-apps/gnome-disk-utility/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()>=2.32.1

34
profiles/templates/3.1/6_ac_install_patch/sys-apps/gnome-disk-utility/burner.patch
Unescape View File

@ -0,0 +1,34 @@
# Calculate format=diff
<pre>
--- src/palimpsest/gdu-section-drive.c 2010-03-14 22:50:51.000000000 +0300
+++ src/palimpsest/gdu-section-drive1.c 2011-10-22 04:40:33.000000000 +0400
@@ -429,6 +429,10 @@
launch_context = NULL;
app_info = G_APP_INFO (g_desktop_app_info_new ("brasero.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xcdroast.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("gnomebaker.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("graveman.desktop"));
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xfburn.desktop"));
if (app_info == NULL) {
/* TODO: Use PackageKit to install Brasero */
dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section)))),
@@ -436,7 +440,7 @@
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"<b><big><big>%s</big></big></b>\n\n%s",
- _("Error launching Brasero"),
+ _("Error launching CD/DVD burning program"),
_("The application is not installed"));
gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -456,7 +460,7 @@
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"<b><big><big>%s</big></big></b>\n\n%s",
- _("Error launching Brasero"),
+ _("Error launching CD/DVD burning program"),
error->message);
g_error_free (error);
gtk_widget_show_all (dialog);
</pre>

1
profiles/templates/3.1/6_ac_install_patch/sys-apps/openrc/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()!=

16
profiles/templates/3.1/6_ac_install_patch/sys-apps/openrc/branding.patch
Unescape View File

@ -0,0 +1,16 @@
# Calculate format=diff
diff --git a/src/rc/Makefile b/src/rc/Makefile
index 9d33192..4999edf 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -50,9 +50,7 @@ ${SRCS}: version.h
.PHONY: version.h.tmp
version.h.tmp:
echo "#define VERSION \"${VERSION}${GITVER}\"" >$@
- if test -n "${BRANDING}"; then \
- echo "#define BRANDING \"${BRANDING}\"" >> $@; \
- fi
+ echo "#define BRANDING \"Calculate Linux\"" >> $@; \
version.h: version.h.tmp
cmp -s $@.tmp $@ && rm $@.tmp || mv $@.tmp $@

1
profiles/templates/3.1/6_ac_install_patch/sys-boot/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/sys-boot/os-prober/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()!=

43
profiles/templates/3.1/6_ac_install_patch/sys-boot/os-prober/chroot.patch
Unescape View File

@ -0,0 +1,43 @@
# Calculate format=diff
diff --git linux-boot-prober linux-boot-prober
index e32dc84..b522567 100755
--- linux-boot-prober
+++ linux-boot-prober
@@ -33,7 +33,7 @@ if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map"; then
else
mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2)
mpoint="$(unescape_mount "$mpoint")"
- if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
+ if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/$(echo ${CHROOT_PATH%/} | cut -d/ -f 2-)" ]; then
type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
if ! grep -q " $mpoint/boot " "$OS_PROBER_TMP/mounted-map"; then
linux_mount_boot "$partition" "$mpoint"
diff --git linux-boot-probes/mounted/common/90fallback linux-boot-probes/mounted/common/90fallback
index 9ff78e1..9a5cf1a 100755
--- linux-boot-probes/mounted/common/90fallback
+++ linux-boot-probes/mounted/common/90fallback
@@ -34,8 +34,10 @@ for kernpat in /vmlinuz /vmlinux /boot/vmlinuz /boot/vmlinux "/boot/vmlinuz*" \
initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
# And Gentoo's also
initrdname4=$(echo "$kernfile" | sed "s/kernel/initramfs\*/")
+ # And Calculate's also
+ initrdname5=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/-install/')
foundinitrd=0
- for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
+ for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" "$initrdname5" 2>/dev/null); do
if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then
initrd=$(echo "$initrd" | sed "s!^$mpoint!!")
result "$partition:$kernbootpart::$kernbasefile:$initrd:root=$mappedpartition"
diff --git os-prober os-prober
index fc4de2c..55dc20b 100755
--- os-prober
+++ os-prober
@@ -147,7 +147,7 @@ for partition in $(partitions); do
else
mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2)
mpoint="$(unescape_mount "$mpoint")"
- if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
+ if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/$(echo ${CHROOT_PATH%/} | cut -d/ -f 2-)" ]; then
type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
for test in /usr/lib/os-probes/mounted/*; do
if [ -f "$test" ] && [ -x "$test" ]; then

19
profiles/templates/3.1/6_ac_install_patch/sys-boot/os-prober/no_readonly.patch
Unescape View File

@ -0,0 +1,19 @@
# Calculate format=diff
diff --git common.sh common.sh
index 30e245e..c295a15 100644
--- common.sh
+++ common.sh
@@ -147,12 +147,7 @@ unescape_mount () {
}
ro_partition () {
- if type blockdev >/dev/null 2>&1 && \
- [ "$(blockdev --getro "$1")" = 0 ] && \
- blockdev --setro "$1"; then
- cleanup_ro_partitions="${cleanup_ro_partitions:+$cleanup_ro_partitions }$1"
- trap cleanup EXIT HUP INT QUIT TERM
- fi
+ :
}
find_label () {

1
profiles/templates/3.1/6_ac_install_patch/x11-drivers/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/x11-drivers/nvidia-drivers/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()!=

15
profiles/templates/3.1/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.6_295.patch
Unescape View File

@ -0,0 +1,15 @@
# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.6&&pkg(sys-kernel/calculate-sources)<3.7&&merge(x11-drivers/nvidia-drivers)>=295&&merge(x11-drivers/nvidia-drivers)<296
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)
{
// no status returned for this function
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ acpi_os_wait_events_complete();
+#else
acpi_os_wait_events_complete(NULL);
+#endif
// remove event notifier
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);

25
profiles/templates/3.1/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_173.patch
Unescape View File

@ -0,0 +1,25 @@
# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=173&&merge(x11-drivers/nvidia-drivers)<174
the nvidia drivers are trying to test for version 2.6.6, but fail to take into
account the first digit. so 3.7.0+ ends up failing the test.
https://bugs.gentoo.org/447566
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -1697,13 +1697,15 @@
# kernel older than 2.6.6, that's all we require to
# build the module.
#
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+ if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
+ [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
SELECTED_MAKEFILE=Makefile.kbuild
RET=0
fi
fi
fi

25
profiles/templates/3.1/6_ac_install_patch/x11-drivers/nvidia-drivers/kernel3.7_304.patch
Unescape View File

@ -0,0 +1,25 @@
# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=304&&merge(x11-drivers/nvidia-drivers)<305
the nvidia drivers are trying to test for version 2.6.6, but fail to take into
account the first digit. so 3.7.0+ ends up failing the test.
https://bugs.gentoo.org/447566
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -1697,13 +1697,15 @@
# kernel older than 2.6.6, that's all we require to
# build the module.
#
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+ if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
+ [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
SELECTED_MAKEFILE=Makefile.kbuild
RET=0
fi
fi
fi

48
profiles/templates/3.1/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_173.patch
Unescape View File

@ -0,0 +1,48 @@
# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=173&&merge(x11-drivers/nvidia-drivers)<174
diff --git a/usr/src/nv/conftest.sh b/usr/src/nv/conftest.sh
index 29012dd..4474130 100644
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -20,6 +20,7 @@ ARCH=$3
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
SOURCES=$4
HEADERS=$SOURCES/include
+HEADERSA=$SOURCES/include/uapi
OUTPUT=$5
XEN_PRESENT=1
@@ -118,7 +119,7 @@ build_cflags() {
fi
fi
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
test_xen
@@ -142,10 +143,10 @@ build_cflags() {
fi
fi
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
diff --git a/usr/src/nv/nv.c b/usr/src/nv/nv.c
index 538217e..73c7234 100644
--- a/usr/src/nv/nv.c
+++ b/usr/src/nv/nv.c
@@ -2609,7 +2609,7 @@ int nv_kern_mmap(
/* prevent the swapper from swapping it out */
/* mark the memory i/o so the buffers aren't dumped on core dumps */
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
}
NV_VMA_FILE(vma) = file;

43
profiles/templates/3.1/6_ac_install_patch/x11-drivers/nvidia-drivers/uapi3.7_304.patch
Unescape View File

@ -0,0 +1,43 @@
# Calculate format=diff pkg(sys-kernel/calculate-sources)>=3.7&&pkg(sys-kernel/calculate-sources)<3.8&&merge(x11-drivers/nvidia-drivers)>=304&&merge(x11-drivers/nvidia-drivers)<305
--- kernel/conftest.sh 2012-10-11 19:18:22.704848496 -0400
+++ kernel/conftest.sh 2012-10-12 20:35:55.707213868 -0400
@@ -20,6 +20,7 @@
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
SOURCES=$4
HEADERS=$SOURCES/include
+HEADERSA=$SOURCES/include/uapi
OUTPUT=$5
XEN_PRESENT=1
@@ -118,7 +119,7 @@
fi
fi
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
test_xen
@@ -146,10 +147,10 @@
fi
fi
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
fi
--- kernel/nv-mmap.c 2012-08-08 22:52:53.000000000 -0400
+++ kernel/nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
@@ -450,7 +450,7 @@
NV_PRINT_AT(NV_DBG_MEMINFO, at);
nv_vm_list_page_count(&at->page_table[i], pages);
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
#if defined(VM_DRIVER_PAGES)

1
profiles/templates/3.1/6_ac_install_patch/x11-misc/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/x11-misc/xscreensaver/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()>=5.10&&merge()<5.21

401
profiles/templates/3.1/6_ac_install_patch/x11-misc/xscreensaver/branding.patch
Unescape View File

@ -0,0 +1,401 @@
# Calculate format=diff
diff --git a/utils/images/logo-180.xpm b/utils/images/logo-180.xpm
index a0cea80..98425f4 100644
--- a/utils/images/logo-180.xpm
+++ b/utils/images/logo-180.xpm
@@ -8,200 +8,201 @@
*/
static const char * const logo_180_xpm[] = {
-"180 180 16 1",
-" c None m None",
-") c #FF0000 m #FFFFFF",
-", c #FFFFFF m #FFFFFF",
-". c #000000 m #000000",
-"- c #ED9E00 m #FFFFFF",
-"' c #4F3504 m #000000",
-"= c #DBDBDB m #000000",
-"> c #B0B0B0 m #000000",
-"+ c #929292 m #000000",
-"; c #797979 m #000000",
-"@ c #A30000 m #000000",
-"# c #604D28 m #000000",
-"$ c #600000 m #000000",
-"% c #37332D m #000000",
-"& c #2D0C05 m #000000",
-"* c #A46E00 m #000000",
-" ",
-" . ",
-" .. ",
-" ... ",
-" . ... ",
-" .. ... ",
-" .&..... ",
-" &&.... ",
-" .@&.... ",
-" $)..... ",
-" .)@.... ",
-" .@)@.... ",
-" &))$.... ",
-" .)))&... ",
-" .@))@&... ",
-" $)))@.... ",
-" &))))$.... ",
-" .)))))&... ",
-" @))))@.... ",
-" $)))))$&... ",
-" .)))))).&.. ",
-" .))))))@.... .. ",
-" .)))))))&'... .. ... ",
-" .@)))))))%'.. . ... ",
-" @)))))))$#&.. .. ... ",
-" $))))))))&#... .& .... ",
-" &))))))))$*%.. &. .... ",
-" $))))))))@#*... .$..... ",
-" &)))))))))&-'.. .@$..... ",
-" $)))))))))&-*.. &)...... ",
-" &)))))))))@*-... .@@..... ",
-" .)))))))))$*-&.. &)@..... ",
-" .)))))))))$**... .@)$..&.. ",
-" .)))))))))&-'.. &))$.&'.. ",
-" $))))))))$'-... .@))$.*'.. ",
-" $)))))))).-'.. $)))&%-... ",
-" @)))))))$#-... .))))&*-.. ",
-" .@)))))))&-#.. &))))&-*.. ",
-" .)))))))$*-... .@))))&--... ",
-" ....................................................$)))))))&-*.........&)))))&-*............................................................... ",
-" .....................................................@))))))$#-&.........$)))))&--................................................................. ",
-" .....................................................&)))))))&-*..........))))))$--.................................................................. ",
-" .....................................................@))))))$*-'.........$))))))$*-.................................................................. ",
-" .....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+&))))))).--..;,,,,,,#@))))))@*-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=#.... ",
-" ....%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&)))))))@'-#..=,,,,,=&)))))))$*-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%@)))))))&--&.%,,,,,,+$)))))))@#-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%$)))))))@'-*..+,,,,,,%)))))))))&-%.#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+$))))))))$*-'.&=,,,,,=&)))))))))&-'.&,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>.)))))))))&--..#,,,,,,;@)))))))))$-#..=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&@))))))))$*-*..>,,,,,,#@)))))))))$**..>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=%@)))))))))&--'.&,,,,,,=&))))))))))@#-..+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;$))))))))))%--..;,,,,,,>$)))))))))))%-&.#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&))))))))))@#--..+,,,,,,;@)))))))))))&-'.%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>=,,,,,,,%@))))))))))$--#..=,,,,,,%))))))))))))$*#..=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;.>,&&=,,+$)))))))))))&--'.%,,,,,,,&))))))))))))@'*..>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,=>>>>>>+>>>>+>>>>+&$;#..;>>&)))))))))))@'--..%>>>>>>+&)))))))))))))&-&.%>>>>+>>>>+>>>>+>>>>+>>>>+>>>>+>>>>>>>>>>>>>>=,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,+...................@&.......$)))))))))))@#--..........$)))))))))))))$*#...............................................%>,,,,,,,,,=.... ",
-" ....+,,,,,,,,,#...................&)........@)))))))))))@*-*..........@)))))))))))))@#*.................................................+,,,,,,,,=.... ",
-" ....+,,,,,,,,+....................@@.......$))))))))))))$*-*..........@))))))))))))))&-&.................................................=,,,,,,,=.... ",
-" ....+,,,,,,,=....................&)@.......)))))))))))))$--#..........@))))))))))))))$*#.................................................%,,,,,,,=.... ",
-" ....+,,,,,,,>....................@)$......&)))))))))))))$*-*..........)))))))))))))))@'*..................................................,,,,,,,=.... ",
-" ....+,,,,,,,+....................)).......$)))))))))))))@*-#..........))))))))))))))))&-..................................................>,,,,,,=.... ",
-" ....+,,,,,,,+...................@)).......@)))))))))))))@#-*..........))))))))))))))))$#'.................................................>,,,,,,=.... ",
-" ....+,,,,,,,+...................@)@......&)))))))))))))))%-*..........)))))))))))))))))&-.................................................>,,,,,,=.... ",
-" ....+,,,,,,,+..................$))$......$)))))))))))))))&--..........)))))))))))))))))$*'................................................>,,,,,,=.... ",
-" ....+,,,,,,,+..................@))&......$)))))))))))))))$*-&.........)))))))))))))))))@%-................................................>,,,,,,=.... ",
-" ....+,,,,,,,+..................))).......@))))))))))))))))&-#.........))))))))))))))))))&*'...............................................>,,,,,,=.... ",
-" ....+,,,,,,,+.................$))).......@))))))))))))))))$*-.........))))))))))))))))))@'*...............................................>,,,,,,=.... ",
-" ....+,,,,,,,+.................@))@.......))))))))))))))))))&-&........)))))))))))))))))))$*'..............................................>,,,,,,=.... ",
-" ....+,,,,,,,+.................)))@.%.....))))))))))))))))))$#*........@))))))))))))))))))@&-..............................................>,,,,,,=.... ",
-" ....+,,,,,,,+................$)))$.*.....)))))))))))))))))))&*&.......$)))))))))))))))))))$*#.............................................>,,,,,,=.... ",
-" ....+,,,,,,,+................@)))$'*.....@)))))))))))))))))))&*.......&))))))))))))))))))))&-&............................................>,,,,,,=.... ",
-" ....+,,,,,,,+...............&))))$**..&%&@)))))))))))))))))))@%#...%&%.))))))))))))))))))))$#*...&%%&%%&%%&%%&%%&%%&%%....................>,,,,,,=.... ",
-" ....+,,,,,,,+...............$))))$*-..+,;@))))))))))))))))))))$#%..+,,#@))))))))))))))))))))&-#..%,,,,,,,,,,,,,,,,,,,,=+..................>,,,,,,=.... ",
-" ....+,,,,,,,+...............@))))$--..+,+@)))))))))))))))))))))&#...=,=&))))))))))))))))))))).-&..#,,,,,,,,,,,,,,,,,,,,,=.................>,,,,,,=.... ",
-" ....+,,,,,,,+...............)))))$*-%.#,>$))))))))))))))))))))))&#...=,'@))))))))))))))))))))@%-%..;,,,,,,,,,,,,,,,,,,,,,#................>,,,,,,=.... ",
-" ....+,,,,,,,+..............$)))))$--&.#,,&))))))))))))))))))))))@&'..%,>$)))))))))))))))))))))$#-...+,,,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+..............@)))))@*-#.%,,#@))))))))))))))))))))))@&'..%=%))))))))))))))))))))))&**...>,,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+..............@)))))@#-#..,,+$)))))))))))))))))))))))@&%..;+$)))))))))))))))))))))@&--..#,,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............&))))))@#-*..=,=&))))))))))))))))))))))))$'&..;%))))))))))))))))))))))@'-#..>,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............&)))))))&--..+,,'@))))))))))))))))))))))))&#...#$))))))))))))))))))))))&*-..#,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............@)))))))&--..#,,>$)))))))))))))))))))))))))&#....)))))))))))))))))))))))&-#..>,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............@)))))))@#-#.&=,,&)))))))))))))))))))))))))@&#...$))))))))))))))))))))))$#-..#,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............)))))))))#-*..>,,;@)))))))))))))))))))))))))@''...)))))))))))))))))))))))&-'..,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............&)))))))))&--&.#,,=&))))))))))))))))))))))))))&*&..&))))))))))))))))))))))@#*..>,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............@)))))))))$*-'.&,,,#@))))))))))))))))))))))))))&*...@))))))))))))))))))))))&-..#,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............@)))))))))@#-*..>,,=&))))))))))))))))))))))))))$##..$))))))))))))))))))))))@##..=,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............@))))))))))%--..#,,,%)))))))))))))))))))))))))))&-&..@))))))))))))))))))))))&*..+,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............)))))))))))$*-#..=,,>&))))))))))))))))))))))))))@#*..$))))))))))))))))))))))$*&.#,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............))))))))))))&--..#,,,%@))))))))))))))))))))))))))&-&..@)))))))))))))))))))))@''.%,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........$))))))))))))&*-'..=,,+$))))))))))))))))))))))))))@#*..$))))))))))))))))))))))&#..=,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........$))))))))))))@'-*..;,,,&)))))))))))))))))))))))))))&-&..))))))))))))))))))))))$#..>,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........$)))))))))))))&*-'..=,,+$))))))))))))))))))))))))))$**..$))))))))))))))))))))))&..;,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........@)))))))))))))@'-*..;,,,.))))))))))))))))))))))))))@%-...))))))))))))))))))))))&%.%,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........@))))))))))))))$*-%..=,,;$))))))))))))))))))))))))))&-'..@)))))))))))))))))))))$&..,,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........@)))))))))))))))&-*..%,,=&))))))))))))))))))))))))))@'-..$)))))))))))))))))))))@&..>,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........@)))))))))))))))$#-#..>,,;@))))))))))))))))))))))))))&*&.&))))))))))))))))))))))...;,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........@))))))))))))))))&*-&.&=,=.)))))))))))))))))))))))))))&&..))))))))))))))))))))))$..%,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........@))))))))))))))))@&-#..+,,#@)))))))))))))))))))))))))))$.$))))))))))))))))))))))@...=,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........$)))))))))))))))))$#-%..=,>&)))))))))))))))))))))))))))))))))))))))))))))))))))))...>,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........$))))))))))))))))))$**..#,,#@))))))))))))))))))))))))))))))))))))))))))))))))))))...+,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...........&))))))))))))))))))@&-'..>,>$))))))))))))))))))))))))))))))))))))))))))))))))))))$..#,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............)))))))))))))))))))@%-..%,,&))))))))))))))))))))))))))))))))))))))))))))))))))))@..%,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............@)))))))))))))))))))$##..;,#@)))))))))))))))))))))))))))))))))))))))))))))))))))@...,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+............$))))))))))))))))))))&*&.&=>$))))))))))))))))))))))))))))))))))))))))))))))))))))...=,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............)))))))))))))))))))))%#..;,&))))))))))))))))))))))))))))))))))))))))))))))))))))&..>,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............@))))))))))))))))))))$''..=#@)))))))))))))))))))))))))))))))))))))))))))))))))))$..;,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.............&)))))))))))))))))))))&#..#+$)))))))))))))))))))))))))))))))))))))))))))))))))))$..;,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+..............@))))))))))))))))))))@&'..=$)))))))))))))))))))))))))))))))))))))))))))))))))))@..&,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+..............$)))))))))))))))))))))$'..+&)))))))))))))))))))))))))))))))))))))))))))))))))))@...=,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...............))))))))))))))))))))))...#%))))))))))))))))))))))))))))))))))))))))))))))))))))...=,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+...............$)))))))))))))))))))))$....))))))))))))))))))))))))))))))))))))))))))))))))))))...+,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+................))))))))))))))))))))))....))))))))))))))))))))))))))))))))))))))))))))))))))))...;,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+................$)))))))))))))))))))))$...@)))))))))))))))))))))))))))))))))))))))))))))))))))&&.#,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................))))))))))))))))))))))&..))))))))))))))))))))))))))))))))))))))))))))))))))))$%.%,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................$))))))))))))))))))))))&&))))))))))))))))))))))))))))))))))))))))))))))))))))$'..,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$#..=,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................+$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$*..>,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................=%)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$*..>,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,+&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-..;,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,#@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-%.#,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,=&)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-'.%,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,;$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@'-#.&,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,&@))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@*-*..=,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,>$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&--&..=,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,,#@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-'..#,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,,=&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$**..%,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,,,>&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).*..&=,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,,,,;$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$'...=,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................,,,,,,,,%@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).&..;,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................=,,,,,,,=&)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$...#,,,,,,,,,,,,,>................>,,,,,,=.... ",
-" ....+,,,,,,,+.................>,,,,,,,,>&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))...%,,,,,,,,,,,,,,+................>,,,,,,=.... ",
-" ....+,,,,,,,+.................;,,,,,,,,,#$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&..&=,,,,,,,,,,,,,,%................>,,,,,,=.... ",
-" ....+,,,,,,,+..................+,,,,,,,,,#$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@...=,,,,,,,,,,,,,,;.................>,,,,,,=.... ",
-" ....+,,,,,,,+...................#+>>>>>>>>%@))))))))))))))))))))))))))))))))))))))))))))))))))))))))@...#>>>>>>>>>>>>>+#..................>,,,,,,=.... ",
-" ....+,,,,,,,+...............................@)))))))))))))))))))))))))))))))))))))))))))))))))))))))&.....................................>,,,,,,=.... ",
-" ....+,,,,,,,+................................@)))))))))))))))))))))))))))))))))))))))))))))))))))))&......................................>,,,,,,=.... ",
-" ....+,,,,,,,+................................&@)))))))))))))))))))))))))))))))))))))))))))))))))))$.......................................>,,,,,,=.... ",
-" ....+,,,,,,,+.................................&@)))))))))))))))))))))))))))))))))))))))))))))))))@........................................>,,,,,,=.... ",
-" ....+,,,,,,,+..................................&@)))))))))))))))))))))))))))))))))))))))))))))))$.........................................>,,,,,,=.... ",
-" ....+,,,,,,,+...................................&@)))))))))))))))))))))))))))))))))))))))))))))$..........................................>,,,,,,=.... ",
-" ....+,,,,,,,+....................................&@)))))))))))))))))))))))))))))))))))))))))))$...........................................>,,,,,,=.... ",
-" ....+,,,,,,,+......................................@)))))))))))))))))))))))))))))))))))))))))&............................................>,,,,,,=.... ",
-" ....+,,,,,,,+.......................................$))))))))))))))))))))))))))))))))))))))@..............................................>,,,,,,=.... ",
-" ....+,,,,,,,+.........................................@)))))))))))))))))))))))))))))))))))&...............................................>,,,,,,=.... ",
-" ....+,,,,,,,+..........................................$))))))))))))))))))))))))))))))))@.................................................=,,,,,,=.... ",
-" ....+,,,,,,,=............................................$))))))))))))))))))))))))))))$&.................................................&,,,,,,,=.... ",
-" ....+,,,,,,,,%.............................................$@))))))))))))))))))))))@$&...................................................;,,,,,,,=.... ",
-" ....+,,,,,,,,=................................................$@@))))))))))))))@@@&'#%..................................................%,,,,,,,,=.... ",
-" ....+,,,,,,,,,=&...................................................$$@@@@@@@$$&''**'...................................................%=,,,,,,,,=.... ",
-" ....+,,,,,,,,,,=+%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%..................#----'............%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%##+,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,&..................&''..............=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+....................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,&.....................................=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#......................................%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+........................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>&.........................................>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>............................................>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>..............................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#................................................#=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>%..................................................&+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>%......................................................%>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=;%..........................................................&;=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>................................................................+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.................................................................%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%................................................................#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
-" ....&,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>.... ",
-" ....%;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>;..... ",
-" ..................................................................................................................................................... ",
-" ................................................................................................................................................... ",
-" .................................................................................................................................................. ",
-" ............................................................................................................................................... ",
+"180 180 17 1",
+" c None",
+". c #020300",
+"+ c #221E1C",
+"@ c #312D2C",
+"# c #422D09",
+"$ c #815711",
+"% c #5D5B5C",
+"& c #B5802B",
+"* c #A98F64",
+"= c #949495",
+"- c #E59C23",
+"; c #FBA616",
+"> c #F6C774",
+", c #E1CAA5",
+"' c #CFD2D4",
+") c #F9E3B8",
+"! c #F1F4F3",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ======== ",
+" ============== ",
+" %===============%% ",
+" ====================%% ",
+" %%=====================%% ",
+" %========================%% ",
+" %=================='''=====%% ",
+" %=================='''!'==%%=*= ",
+" %%=================='+++'=%%%*,,, ",
+" %%===================+++++=%%**),,) ",
+" %%%%=======%%%%%%%=====+++==%*&->,,)))) ",
+" %%%%%%=%%%%%%@@@@@%%%%%=%%%%%*&-;-->>>)))) ",
+" @%%%%%%%%%@@+++++++++@%%%%%%*$&------->>>>)))) ",
+" @%%%%%%%%@@@+++++++++++@@%%*&&>>>>>---------->>>>)) ",
+" @%%%%%%%@@++++++++++++++++@%$&&&>,>>>>---------&>>), ",
+" @@%%%%%@@+++++++++++++++++++##$$#**>>>>>>>>&********* ",
+" @@@%%%@@++++++++++++++++++++++#$$$$&&&*>>>$$&&&&&&&*** ",
+" +@@@@@@++++++++++++++++++++++++@$&--&&$$&&&&&&&&---&& ",
+" ++@@@@@++++++++++++++++++++++++++@#$&&--&--&&&&&$$$ ",
+" +++@@@++++++++++++++++++++++++++++++#$$&&&&&&&&$$ ",
+" ++++++++++++++++++++++++++++++++++++++++@#### ",
+" +++++++++++++++++++++++++++++++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++++++++++++ ",
+" +++++++++++++++++++++++++++++++++++++++++++ ",
+" +++++++++++++++++++++++++++++++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++++++++++++++ ",
+" +++++++++++++++++++++++++++++++++++++++++++++ ",
+" ++++++++++++++++++++...++++++++++++++++++++++ ",
+" ++++++++++++++++@@%%=====%@+++++++++++++++++++ ",
+" ++++++++++++++++@%=='!!!!!'%@++++++++++++++++++ ",
+" +++++++++++++.+@%=''!!!!!!!!'=%+.+++++++++...++++ ",
+" ++++++++++++++@%='!!!!!!!!!!!!!=%@+++++++@@%%%@+++ ",
+" ++++++++++++++@='!!!!!!!!!!!!!!!!'=@++++++%='!'=@++ ",
+" +++++++++++++@%='!!!!!!!!!!!!!!!!!!'==%%%%=='!!!'=%++ ",
+" +++++++++++++@='!!!!!!!!!!!!!!!!!!!!!!'===='!!!!!!!=@++ ",
+" @@@++++++++++%='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=@+@@@ ",
+" @@@@++++++++@%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%+@@%%%%%%%%%%%% ",
+" @@@@@++++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%@@%%%%%%%%%=========% ",
+" @@@@@@+++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=%@@%%%%%%%%%============ ",
+" @@%@@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=@@%%%%%%%%%%%%========== ",
+" @%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'@@%%@@@@@@@@@@@@%%%======== ",
+" %%%%%@@+++++++%='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%@@@@@++++++++++@@%%%%======= ",
+" %%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=%+++++++++++++++++++@%%===='== ",
+" %%%%%%@@+++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%++++++++++++++++++++@@%%==''''' ",
+" %%%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=++++@@@@@@@@@@@@@@+++++@%==='''' ",
+" %%%%%%@@++++++++='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=@++@@%%=========%%@@+++++@@==''''' ",
+" %%%%%%@@+++++++@%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=%%%====''''''''''====%%@@++@%==''''' ",
+" %%%%%%%@++++++++%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='''!!!!!!!!!!!!!!!!'==%@@++@%=''''' ",
+" %%%%%%%@++++++++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'==''!!!!!!!!!!!!!!!!!!''''=%%@@%%=''''' ",
+" %%==%%%@++++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='!!!!!!!!!!!'''!!!!!!!!'==%@@%%=='''' ",
+" %%==%%%@+++++++++%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='!!!!!''== !''=%@@%=''''' ",
+" %====%%@+++++++++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=='!!''' =%%%==='''= ",
+" %=====%@++++++++++=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==!!!=% =%%===== ",
+" %=====%@@++++++++@%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==!'% ",
+" %=====%@+++@%%@++.@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=='= ",
+" %=====%@@++@%==@++.%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=% ",
+" =====%%@++@%'==@++@%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!== ",
+" %=====%@++@%'!=@+++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!== ",
+" ======%@++%='!!%++++=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ",
+" %=====%@++%='!!'%.++@'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ",
+" ======%++@='!!'=%++@%'!!!!!!!!!!!!!!!!!!!!!))))))!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ",
+" ======%@+%='!!!'%@++@='!!!!!!!!!!!!!!!!!!!!)>---->,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ===== == == = ",
+" ======%@+@='!!!!=@+++%'!!!!!!!!!!!!!!!!!!!!!)-;;;;;*,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' ======== == == == ",
+" ======%@+@%'!!!!'=+++.%'!!!!!!!!!!!!!!!!!!!!!)-;;;;-*='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' == === == == == ",
+" ======@+@%'!!!!!=%++++=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' === = ===== == ==== == == == ===== ===== === ",
+" ======%@@%'!!!!!'%++++@=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' == ======= == ====== == == == ======= ===== ===== ",
+" ======%+@%'!!!!!=%@++++%=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' == == == == === == == == == == == == == == ",
+" =='===%@@%'!!!!''=@++++@%=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!)>>>)!!!!!!!!!' == ==== == == == == == ==== == ======= ",
+" ='''===@@='!!!!'=@ ++++@%'!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;>,!!!!!!!!! == ====== == == == == == ====== == ======= ",
+" =''''=%%%='!!!''=% ++++@%'!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>;;;;->'!!!!!!!! === = === == == == == == == === == == == ",
+" '''''==%%='!!!!'=@ @+++@='!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!)>;;;;-&='!!!!!! == === == == == === == == === == == == == === == ",
+" ''''''=%%='!!!!'=% @@++@='!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>;;;;-&='!!!!!! ======== ======= == ===== ======== == ======= ==== ===== ",
+" '''''''===='!!!''= @@@+@=!!!!!!!!!'''!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)--;-&*%=!!!!!! ===== ==== == == ==== ==== == == ==== == === === ",
+" =''''''''==='!!!''= @@@+@=!!!!!!!!!'''!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!)--&*%='!!!!!! ",
+" ='''''''''''''!'' @@@+@=!!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!,**%=''!!!!!! ",
+" ='''''''''!!!'' %@@+@='!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!''=='!!!!!!! ",
+" =='''!!! %%@+@='!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
+" %%%@@%'!!!!!'''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!))))!!!!!!!!! ",
+" %%%@@%'!!!!!'''''''''!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)>>>>))!!!!!! ;;;;;;;; ;;;; ;;;; ;;; ;;; ",
+" %%%@+%=!!!!!'''''''''!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)>-;->,''!!!! ;;;;;;;;;;;;;- ;;;;;- ;;;;;- ;;;;;;; ;;;;;;- ",
+" %%%@+@=!!!!!''''''''''!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;-*''!!! ;;;;;;;;;;;;;;;- ;;;;;& ;;;;;- $;;;;;;;;; ;;;;;;;;-$ ",
+" %=%@+=!!!!!''''''''''!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!!! ;;;;;;;;;;;;;;;;;- ;;;;;&# ;;;;;- $;;;;;;;;;- ;;;;;;;;;&$ ",
+" %=%@+%!!!!!'''''''''''!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!!);;;;;;;---&--;;;;;;- ;;;;;&# ;;;;;-.$;;;;;;;;;;- ;;;;;;;;;-&$ ",
+" %==%+%'!!!!''''''''''''!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)-;;;&*='!!>;;;;;;-&$$$$&-;;;;;-& ;;;;;&# ;;;;;-+#;----;;;;;;&&;;;;;;;---&$# ",
+" ==%@@='!!!'''''''''''''!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!>;;;;;-&$ $-;;;;;- ;;;;;&# ;;;;;-+ $$&&-;;;;;;;;;;;-&$### ",
+" ===@@%'!!!!''''''''''''''!!,-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!-;;;;;&# &-;;;;;$ ;;;;;&# ;;;;;-+ $--;;;;;;;;;-&#. ",
+" %==%@@'!!!!'''''''''''''''!,-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*=' ;;;;;-$ ;;;;;$ ;;;;;&# ;;;;;-+ &;;;;;;;;-$. ",
+" ===%@=!!!!'''''''''''''''',-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*== ;;;;;& ;;;;;& ;;;;;&# ;;;;;-+ -;;;;;;-$# ",
+" ===%@%=!!!!''''''''''''''',-;;;;-$=''!!!!!!!!!!!!!!!!'>-;;;&*= ;;;;;$ ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;;;-# ",
+" ===%@%!!!!''''''''''''''',-;;;;-$=''!!!!!!!!!!!!'''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;;;& ",
+" ===%@%'!!!!'''''''''''''',-;;;;-$=''!!!!!''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
+" >))) ===%%='!!!'''''''''''''',-;;;;-$='''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
+" -->>>>>>)))>>>****%%='!!!''''''''''''',-;;;;-$='''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
+" ;;-->>>>>>>))>>>>>>&*#*,'!!''''''''''''',>;;;;-&*'''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
+" ;;;;-->>>>>>>>>>>>>>>-&&&&,,'''''''''''''',>-;;;;&*=''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-& ",
+" ;;;;;--->>>>>>>>>>>>>------&>,,'''''''''''',>-;;;;-&=''''''''''''''''!!>;;;;&$ ;;;;-# ;;;;;&$ -;;;;&$ ;;;;;&+ ;;;;;-& ",
+" ;;;;;-;;--->>>>>>>>>>>>--------->,'''''''''''',-;;;;;&='''''''''''''''!!!>;;;;&$ ;;;;-# ;;;;;&$ -;;;;-$ ;;;;-&+ ;;;;;;- ",
+" ;;----;;;-->>>---->>>>-----------&>,'''''''''',-;;;;;-&'''''''''''''!!! ;;;;&$ ;;;;-# ;;;;;&$ ;;;;-& ;;;;-&+ ;;;;;;;-& ",
+" ;------;;;;-------;->----;;;;------&&,''''''''''>;;;;;;->,'''''''''!!!! ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;- ;;;;;-$+ ;;;;;;;;-- ",
+" ------;;;;;;;-----;-----;;;;;;;------&*'''''''''>-;;;;;;->,'''''!!!!!! ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;-& ;;;;;&$ ;;;;;;;;;;;-- ",
+" ------;;;;;;;-----;;;;;;;;;;;;;;;-----&>,''''''',>;;;;;;;->>>>,,)))>>> ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;-- ;;;;;;$+ ;;;;;;--;;;;;-; ",
+" -----;;;;;;-----;;;;;;;;;;;;;;;;------->,''''''',-;;;;;;;;;;;-----;;;; ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;- ;;;;;;;-# ;;;;;;;;;&&-;;;;;;;;; ",
+" ---;;;;;;-----;;;;;;;;;;;;------------>,!!!!!!',-;;;;;;;;;;;;;;;;;;;$ ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;;;;;;;;;;;;-$# ;;;;;;;;;;-$+#-;;;;;;;;;- ",
+" --;;;;;------;;;;;;;;;;;;----------;;->,!!!!!!!,>--;;;;;;;;;;;;;;;;# ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;;;;;;;;;;-&# ;;;;;;;;-&$+ --;;;;;;;-$ ",
+" ----;;--------;;;;;;;;;;----- !!!!!!!,&-;;;;;;;;;;;;;;;-# ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;;;;;;;;;&# ;;;;;;;-&#. --;;;;;;&$ ",
+" ----;----&------;;;;;;;--- &&&-----------;-# ;;--&$ ;;-;-# ;;;-&$ ---;;;;;;;;-&$# ;;---&&$#. &&&----&$ ",
+" -------& &-------;;;;--& #$&&&&&&&&&&&&&# ;-&&$# ;-&&&# --&&$# &&--------&#. -&&&$#. $&&&&$# ",
+" --------- ############## #### #### #### ######### ### ### ",
+" ------- ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
" ",
" ",
" "};

1
profiles/templates/3.1/6_ac_install_patch/xfce-extra/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

1
profiles/templates/3.1/6_ac_install_patch/xfce-extra/xfce4-mixer/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()!=

0
profiles/patches/xfce-extra/xfce4-mixer-4.10-change_icon.sh → profiles/templates/3.1/6_ac_install_patch/xfce-extra/xfce4-mixer/xfce4-mixer-4.10-change_icon.sh
Unescape View File

1
profiles/templates/3.1/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip merge()!=

9
profiles/templates/3.1/6_ac_install_patch/xfce-extra/xfce4-xkb-plugin/font.patch
Unescape View File

@ -0,0 +1,9 @@
# Calculate format=diff
--- panel-plugin/xkb-cairo.c 2012-07-17 16:23:24.997030066 +0400
+++ panel-plugin/xkb-cairo.c 2012-07-17 16:47:34.107054590 +0400
@@ -27,7 +27,7 @@
#include "xkb-util.h"
#include "xfce4-xkb-plugin.h"
-#define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold %d"
+#define XKB_PREFERRED_FONT "Droid Sans, Courier New, Courier 10 Pitch, Monospace Bold %d"

6
x11-misc/glipper/Manifest
Unescape View File

@ -1,3 +1,3 @@
DIST glipper-2.3.tar.gz 87465 RMD160 fff5130646e7fcb12af9c6090c81a739ef760217 SHA1 d84dd99d0228c414afc2175c2d9144ae300aae72 SHA256 db3083f960b33bc2ce8ba0af51c9c1f16731b45ba85cfa1387a4b8d556b434d9
EBUILD glipper-2.3-r1.ebuild 1116 RMD160 7d17cef3ae1e10f8c5bbc39d370401e5c73a6471 SHA1 5db208f27d7ad95d09bdcdb8173a6e771ed7ac30 SHA256 9aa4c8575b7d7d38f908e55914ce07b63c837cbbbf545da590b9e5555919d2e2
MISC metadata.xml 336 RMD160 b67de96a18095f238e3bf68d80a4cd10614a8de5 SHA1 88b0770a743b196e21ba08140d68c72116dfc390 SHA256 66a3d11dc1fc77c9a7831bfd089ef5c18fde1a95202d98aaf6055c69740bd946
DIST glipper-2.4.tar.gz 87599 SHA256 c84b4b77b342d3409b125ef0526948ae159074d3472dd81e3db6b95c5b33fd86 SHA512 7b4293dac8d7db6fe49ba57fec132167ecf0442218ab217f827f8368af250262de21d2ce1b00b84d2f7179ef4bf555e63f73420278a6579d7a51e5574b7db128 WHIRLPOOL 0455afcc78af0d1f08ca71d4cd2bf3e308ad8420c62f0c21e371ac6740162f012bfd187308002c9b0fd4efed3f942ac9e5c656a3f2cf6c34be8426b7f857ec19
EBUILD glipper-2.4.ebuild 1012 SHA256 bda0cf68adf9ab413535b9afdffdbd79107f7872d3cbadb6397090ec728da430 SHA512 69b0fbe38bd5cf9b6c455c514c7c69feada2bc02db9a98071ba480ffcdfee5521fbb9debcbdfa0d9d088b495e68917dc84d01309f46a58ece7353faa9af14636 WHIRLPOOL d981a3565d136abf7e56dc484af4f5840ba03340ea1a0e3c97c53a6b4b071aa3f2d37c311a3b51df9745451a50370c3000c088a362b13526de82b741693aeb47
MISC metadata.xml 336 SHA256 66a3d11dc1fc77c9a7831bfd089ef5c18fde1a95202d98aaf6055c69740bd946 SHA512 711dc15527aec5bc2b4dc8064f2ced1f53dd5eb3ca88171699a11ed0633b2d070b9c2e9eb58a3ceed3369c484726004d57ecc9d9b4112fc4f514da39f96325e7 WHIRLPOOL 325d6c17f14b60c71a109ab21290b21b7d21865064afc1fb77ad4900864db02c0a1a7f14221874ab28142be2d73ea19ed35c5e78641c4d074bcd3640d40d52de

14
x11-misc/glipper/glipper-2.3-r1.ebuild → x11-misc/glipper/glipper-2.4.ebuild
Unescape View File

@ -1,7 +1,3 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-2.3.ebuild,v 1.1 2012/03/21 10:52:36 ssuominen Exp $
EAPI=4
PYTHON_DEPEND="2:2.7"
@ -18,18 +14,22 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
RDEPEND="dev-libs/keybinder[python]
>=dev-libs/libappindicator-0.4:0
RDEPEND="!x11-misc/glipper
dev-libs/keybinder:0[python]
dev-libs/libappindicator
dev-python/gconf-python
dev-python/pycrypto
dev-python/pygtk:2
dev-python/python-prctl
dev-python/pyxdg"
DEPEND="${RDEPEND}
dev-python/python-distutils-extra"
>=dev-python/python-distutils-extra-2.37"
src_install() {
sed -e "s:DATA_DIR = \"\":DATA_DIR = \"/usr/share\":g" \
-i glipper/defs.py
distutils_src_install
dodir /etc
Write Preview
Loading…
Cancel
Save