novell4gentoo
/
experimental
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys-auth/CASA: Bump

This commit is contained in:
geos_one 2010-02-18 06:58:45 +00:00
parent f19673184c
commit 9e5f55a769
10 changed files with 10 additions and 798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
branches/experimental/sys-auth/CASA/CASA-1.6.659.ebuild
View File

@ -1,90 +0,0 @@
# Created by George Hron @ 2007.02.05
inherit eutils kde-functions mono autotools
LICENSE="LGPL"
MY_PN="CASA"
MY_VER="1.6"
HOMEPAGE="http://www.novell.com"
SRC_URI="http://forge.novell.com/modules/xfcontent/private.php/casa/CASA_1.6/CASA/downloads/source/${MY_PN}-${PV}.tar.bz2"
DESCRIPTION="Novell Common Authentication Service Adapter (CASA)"
SLOT="0"
DEPEND="dev-lang/mono
dev-dotnet/glade-sharp
dev-dotnet/gtk-sharp
app-crypt/mit-krb5
>=kde-base/kdelibs-3.5
<kde-base/kdelibs-3.6
gnome-base/gnome-keyring
gnome-base/gnome-vfs
virtual/jdk"
S=${WORKDIR}/${MY_PN}-${PV}
KEYWORDS="~x86"
src_unpack() {
unpack ${A}
cd ${S}
eautoreconf
epatch ${FILESDIR}/${MY_PN}-${MY_VER}-glib-glade.patch
epatch ${FILESDIR}/${MY_PN}-${MY_VER}-gnome.patch
epatch ${FILESDIR}/${MY_PN}-${MY_VER}-qt.patch
set-kdedir 3.5
sed -i 's@/opt/kde3@${KDEDIR}@g' `grep -ril "/opt/kde3" .`
}
src_compile() {
econf || die econf failed
emake || die emake failed
rm lib/Release/libad_ff.so.1
rm lib/Release/libad_gk.so.1
}
src_install() {
dodir /lib/security
mv lib/Release/pam_*.so ${D}/lib/security
insinto /usr/lib
doins lib/Release/*.dll
doins lib/Release/*.jar
doins lib/Release/*.so*
dosym /usr/lib/libad_ff.so.1.1.1 /usr/lib/libad_ff.so.1
dosym /usr/lib/libad_gk.so.1.1.1 /usr/lib/libad_gk.so.1
insinto /usr/bin
doins bin/Release/CASAManager.exe
doins c_gui/CASAManager.exe.config
exeinto /usr/bin
mv c_gui/CASAManager.sh c_gui/CASAManager
doexe c_gui/CASAManager
insinto /usr/bin
doins bin/Release/micasad.exe
exeinto /usr/sbin
mv c_micasad/startup/micasad.sh c_micasad/micasad
doexe c_micasad/micasad
newinitd ${FILESDIR}/micasad.rc micasad
insinto /usr/share/applications
doins c_gui/CASAManager.desktop
exeinto /usr/sbin
for x in casacfgpam casaucfgpam; do
doexe c_micasad/startup/$x
done
exeinto /usr/bin
for x in installcasa uninstallcasa iscasaconfiged; do
doexe ${FILESDIR}/$x
done
insinto /usr/include
doins include/*.h
doicon c_gui/images/*.png
insinto /usr/share/doc/${P}/help/en
doins c_gui/help/en/*
dosym /usr/share/doc/${P}/help /usr/share/doc/packages/CASA/help
dodir /usr/share/doc/packages/CASA/images
dodoc c_doc/*.doc
dodoc doc/CASA_Reference_Guide.pdf
}

85
branches/experimental/sys-auth/CASA/CASA-1.7.1592-r1.ebuild
View File

@ -1,85 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit eutils mono autotools
HOMEPAGE="http://www.novell.com"
SRC_URI="http://ftp.mars.arge.at/n4g/${P}.tar.bz2"
DESCRIPTION="Novell Common Authentication Service Adapter (CASA)"
KEYWORDS="~x86 ~amd64"
LICENSE="LGPL"
SLOT="0"
DEPEND="dev-lang/mono
dev-dotnet/glade-sharp
dev-dotnet/gtk-sharp
app-crypt/mit-krb5
gnome-base/gnome-keyring
gnome-base/gnome-vfs
virtual/jdk"
src_prepare() {
# epatch ${FILESDIR}/${PN}-1.6-glib-glade.patch
# epatch ${FILESDIR}/${PN}-1.6-gnome.patch
# epatch ${FILESDIR}/${PN}-1.6-qt.patch
eautoreconf
}
src_configure() {
econf || die econf failed
}
src_compile() {
emake || die emake failed
die
}
src_install() {
dodir /lib/security
mv lib/Release/pam_*.so ${D}/lib/security
insinto /usr/lib
doins lib/Release/*.dll
doins lib/Release/*.jar
doins lib/Release/*.so*
dosym /usr/lib/libad_ff.so.1.1.1 /usr/lib/libad_ff.so.1
dosym /usr/lib/libad_gk.so.1.1.1 /usr/lib/libad_gk.so.1
insinto /usr/bin
doins bin/Release/CASAManager.exe
doins c_gui/CASAManager.exe.config
exeinto /usr/bin
mv c_gui/CASAManager.sh c_gui/CASAManager
doexe c_gui/CASAManager
insinto /usr/bin
doins bin/Release/micasad.exe
exeinto /usr/sbin
mv c_micasad/startup/micasad.sh c_micasad/micasad
doexe c_micasad/micasad
newinitd ${FILESDIR}/micasad.rc micasad
insinto /usr/share/applications
doins c_gui/CASAManager.desktop
exeinto /usr/sbin
for x in casacfgpam casaucfgpam; do
doexe c_micasad/startup/$x
done
exeinto /usr/bin
for x in installcasa uninstallcasa iscasaconfiged; do
doexe ${FILESDIR}/$x
done
insinto /usr/include
doins include/*.h
doicon c_gui/images/*.png
insinto /usr/share/doc/${P}/help/en
doins c_gui/help/en/*
dosym /usr/share/doc/${P}/help /usr/share/doc/packages/CASA/help
dodir /usr/share/doc/packages/CASA/images
dodoc c_doc/*.doc
dodoc doc/CASA_Reference_Guide.pdf
}

90
branches/experimental/sys-auth/CASA/CASA-1.7.1592.ebuild
View File

@ -1,90 +0,0 @@
# Created by George Hron @ 2007.02.05
inherit eutils kde-functions mono autotools
LICENSE="LGPL"
MY_PN="CASA"
MY_VER="1.6"
HOMEPAGE="http://www.novell.com"
SRC_URI="http://forge.novell.com/modules/xfcontent/private.php/casa/CASA_1.6/CASA/downloads/source/${MY_PN}-${PV}.tar.bz2"
DESCRIPTION="Novell Common Authentication Service Adapter (CASA)"
SLOT="0"
DEPEND="dev-lang/mono
dev-dotnet/glade-sharp
dev-dotnet/gtk-sharp
app-crypt/mit-krb5
>=kde-base/kdelibs-3.5
<kde-base/kdelibs-3.6
gnome-base/gnome-keyring
gnome-base/gnome-vfs
virtual/jdk"
S=${WORKDIR}/${MY_PN}-${PV}
KEYWORDS="~x86"
src_unpack() {
unpack ${A}
cd ${S}
eautoreconf
epatch ${FILESDIR}/${MY_PN}-${MY_VER}-glib-glade.patch
epatch ${FILESDIR}/${MY_PN}-${MY_VER}-gnome.patch
epatch ${FILESDIR}/${MY_PN}-${MY_VER}-qt.patch
set-kdedir 3.5
sed -i 's@/opt/kde3@${KDEDIR}@g' `grep -ril "/opt/kde3" .`
}
src_compile() {
econf || die econf failed
emake || die emake failed
rm lib/Release/libad_ff.so.1
rm lib/Release/libad_gk.so.1
}
src_install() {
dodir /lib/security
mv lib/Release/pam_*.so ${D}/lib/security
insinto /usr/lib
doins lib/Release/*.dll
doins lib/Release/*.jar
doins lib/Release/*.so*
dosym /usr/lib/libad_ff.so.1.1.1 /usr/lib/libad_ff.so.1
dosym /usr/lib/libad_gk.so.1.1.1 /usr/lib/libad_gk.so.1
insinto /usr/bin
doins bin/Release/CASAManager.exe
doins c_gui/CASAManager.exe.config
exeinto /usr/bin
mv c_gui/CASAManager.sh c_gui/CASAManager
doexe c_gui/CASAManager
insinto /usr/bin
doins bin/Release/micasad.exe
exeinto /usr/sbin
mv c_micasad/startup/micasad.sh c_micasad/micasad
doexe c_micasad/micasad
newinitd ${FILESDIR}/micasad.rc micasad
insinto /usr/share/applications
doins c_gui/CASAManager.desktop
exeinto /usr/sbin
for x in casacfgpam casaucfgpam; do
doexe c_micasad/startup/$x
done
exeinto /usr/bin
for x in installcasa uninstallcasa iscasaconfiged; do
doexe ${FILESDIR}/$x
done
insinto /usr/include
doins include/*.h
doicon c_gui/images/*.png
insinto /usr/share/doc/${P}/help/en
doins c_gui/help/en/*
dosym /usr/share/doc/${P}/help /usr/share/doc/packages/CASA/help
dodir /usr/share/doc/packages/CASA/images
dodoc c_doc/*.doc
dodoc doc/CASA_Reference_Guide.pdf
}

45
branches/experimental/sys-auth/CASA/CASA-1.8.0_pre1.ebuild
View File

@ -1,45 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
MY_P="${P/_pre/-pre}"
inherit eutils mono cmake-utils java-pkg-2
HOMEPAGE="http://www.novell.com"
SRC_URI="http://ftp.mars.arge.at/n4g/${MY_P}.tar.bz2"
DESCRIPTION="Novell Common Authentication Service Adapter (CASA)"
KEYWORDS="~x86 ~amd64"
LICENSE="LGPL"
SLOT="0"
DEPEND="dev-lang/mono
dev-dotnet/glade-sharp
dev-dotnet/gtk-sharp
app-crypt/mit-krb5
gnome-base/gnome-keyring
gnome-base/gnome-vfs
>=virtual/jdk-1.5"
RDEPEND="dev-lang/mono
dev-dotnet/glade-sharp
dev-dotnet/gtk-sharp
app-crypt/mit-krb5
gnome-base/gnome-keyring
gnome-base/gnome-vfs
>=virtual/jre-1.5"
S="${WORKDIR}/${MY_P}"
mycmakeargs="-DSYSCONF_INSTALL_DIR=/etc
-DLIBROOT_INSTALL_DIR=/$(get_libdir)"
src_prepare() {
cp "${FILESDIR}"/*casa* micasad/startup || die "Error applying patch"
}
src_install() {
cmake-utils_src_install
}

2
branches/experimental/sys-auth/CASA/CASA-1.8.0_pre2.ebuild → branches/experimental/sys-auth/CASA/CASA-1.8.0_pre3.ebuild
View File

@ -41,7 +41,7 @@ src_prepare() {
src_compile() {
cmake-utils_src_compile -j1
cmake-utils_src_compile
}
src_install() {

6
branches/experimental/sys-auth/CASA/ChangeLog
View File

@ -2,6 +2,12 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Feb 2010; Mario Fetka <mario.fetka@gmail.com> -CASA-1.6.659.ebuild,
-files/CASA-1.6-glib-glade.patch, -files/CASA-1.6-gnome.patch,
-files/CASA-1.6-qt.patch, -CASA-1.7.1592.ebuild, -CASA-1.7.1592-r1.ebuild,
-CASA-1.8.0_pre1.ebuild, -CASA-1.8.0_pre2.ebuild, +CASA-1.8.0_pre3.ebuild:
Bump
17 Feb 2010; Mario Fetka <mario.fetka@gmail.com> files/micasad.cmake:
update init script 2nd round

16
branches/experimental/sys-auth/CASA/Manifest
View File

@ -1,18 +1,8 @@
AUX CASA-1.6-glib-glade.patch 5837 RMD160 0aa2a907f31e6770c8ed4e521e459cb14812e859 SHA1 ecb32e8dfa28ee669227614ff84cd00a11a3739b SHA256 7e557daa5069a41d01ed4b85c8b280730622fa5c3c36ac6c0076add0b6b9a6eb
AUX CASA-1.6-gnome.patch 13727 RMD160 36152ba5a3aa49d1fe116121c119ba46543f8f35 SHA1 3efdfcca6367085a9bce63558d656a05ed54d920 SHA256 b2cc683afb211c246dc948fe0d490816d99d291c05f631152e06040c857eb3da
AUX CASA-1.6-qt.patch 5773 RMD160 16cd09004df7bb30952e3943aa2948eb867c468c SHA1 89e0cae94cbc6822814400442103256073ae202d SHA256 0ff50b88e10c72f598ead84046199091bfec95b92bb7098bd3f1aec9e7426323
AUX installcasa 169 RMD160 5712ad3441c72d9ad2843c2c92eaf39e7240d14d SHA1 b6064db4ae8c8fb7a851bc77e5cb45a72232fe26 SHA256 865772233a65c4ac56a2499b0f96652bca251900ff481dc0ec67cd3630993222
AUX iscasaconfiged 118 RMD160 4080032d0e370a0301ed0ecd44c398b030a4a4f2 SHA1 2b4fd75e8745599ab7e7d15c4cbf04beeae18d96 SHA256 926b22587978c90727b4835150520bce354835d4728c6b19c631f62fa6e20311
AUX micasad.cmake 441 RMD160 12fc12d8b47c2745a371a444aad8b56a80bda789 SHA1 136ec00dc744e4dcba69109e49a140f2164618b6 SHA256 8f7ce2f28bb350c3964e88d4a0ada03e2fd68d114ae48c1e661f3b78adf8587a
AUX uninstallcasa 151 RMD160 21d8ced76fc6660e43d6e9ac95d5da58a519957b SHA1 a76df9443dc8cb41c0155052e2f41d8d4f114746 SHA256 9db17c287a1e4ed5b58234c52a6b5e5fead23cfd74ed11f6f1059d5071bd9de8
DIST CASA-1.6.659.tar.bz2 3651237 RMD160 61053e960ee1c8824548c26d4a5d1a1f47695390 SHA1 4ebe83d3358e910b2d68d17bad2d946ed93ea9e4 SHA256 dd60dd58d54fcb87d679aa285cc36e1ebf645ad92daac8cb214cc2d89462a5c7
DIST CASA-1.7.1592.tar.bz2 8871317 RMD160 2ac5059fb51777d4e58b191e7e22af379266d7c6 SHA1 e96a7083150b4e100003789c7b41a6a97939bff0 SHA256 dacf72cf4ab74e00ea08fdae59489a457cffb297115fedb324f67c1558e69971
DIST CASA-1.8.0-pre1.tar.bz2 4473797 RMD160 caa311ec7be8fdf6bf52238bf188bddc9841f05f SHA1 6cfb135e125143f71e6187f6045992232b577029 SHA256 8944c28d260ac4f8f619fe82085dae6b73ee80d3acb43717d7cc7d9bc3ec7b89
DIST CASA-1.8.0-pre2.tar.bz2 4473001 RMD160 845b5b0121b09baa65c559c611c29d58749f2a84 SHA1 819632b5c46b2120054c6b7dfaaccfa26750cfb8 SHA256 2536b7172b35302d71babd250a2ce325eec6ab379cc1cc269a1135e36aca16ce
EBUILD CASA-1.6.659.ebuild 2239 RMD160 78021f4c00b23d9b96cd9b5e9b1bd33baf7d44b4 SHA1 9bf80ba657aa57b169cf01e7525dbef8c71fc08d SHA256 43a21b152d13fef160dd04c4974e9b23333a09488a6ed1f948ceb449e93dafa6
EBUILD CASA-1.7.1592-r1.ebuild 1993 RMD160 47ae6542add6cc55542cbaed3b7d5ea3496b1e50 SHA1 f34af5bb4d048456b7d5163af5b21daabef1a1c2 SHA256 0bef7bd7aa1e410d02257aa4d77d27a792f523697e6402f2b6baa173ac7bb7bb
EBUILD CASA-1.7.1592.ebuild 2239 RMD160 78021f4c00b23d9b96cd9b5e9b1bd33baf7d44b4 SHA1 9bf80ba657aa57b169cf01e7525dbef8c71fc08d SHA256 43a21b152d13fef160dd04c4974e9b23333a09488a6ed1f948ceb449e93dafa6
EBUILD CASA-1.8.0_pre1.ebuild 962 RMD160 bfbe9fb0579e23a4432fa4f7f5562a8c19306766 SHA1 b318d5435cc05c1612df72e4600fb2cef4c096c3 SHA256 7f8811ec170c81c61d434d67057d64ca2240bdbc5666b82fff9251c0ae2b3738
EBUILD CASA-1.8.0_pre2.ebuild 1011 RMD160 77486758afa86b8f911a6d96403415c57176b7bf SHA1 dbc67b2c9fd22ea82e6590a3f14ce70f13863c14 SHA256 44a76159b90353365b390fa5f071b65133292856e6c59e053c18998538a5b9d5
MISC ChangeLog 856 RMD160 fce16189024cfbdfb88a6752b4294933e413d478 SHA1 d8d0bd823121b7b6bae04038dcad7427b07c6e96 SHA256 198f4b08327550c0cf558c26b5d8345cf5e9edd48b754c8b9872b1e37dbd35bf
DIST CASA-1.8.0-pre3.tar.bz2 4472850 RMD160 8212b721ed4fd8a17cadbffb00042e5e21fad34c SHA1 402b99e54b2a864d2bc4c0c1bf4b3223f49f2469 SHA256 31dfd04da95a5899eab8b8500539c092713ab8bf34418340de700e9e005402a1
EBUILD CASA-1.8.0_pre3.ebuild 1007 RMD160 0d80a49e86d83ff0da1e451481a710f68a14902b SHA1 54a3d5f1a46fc5337f025898c370282e363fe860 SHA256 6477a5238d3e6035b4661c7edbeb336492831f1eeff8b1b2dbed2b076885d351
MISC ChangeLog 1156 RMD160 a7c090de9ca8383452d53d0acdc0731e744ee0eb SHA1 cf814218cb60c68a1b2c282d4379ed4a4a980ffc SHA256 29700026a57dd223a6e46b187a473b17b31e62d071d3d63e542ad470eea7e13b
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

109
branches/experimental/sys-auth/CASA/files/CASA-1.6-glib-glade.patch
View File

@ -1,109 +0,0 @@
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.am CASA-1.6.659/c_adlib/ad_gk/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/Makefile.am 2007-02-05 14:53:58.000000000 +0100
@@ -48,7 +48,7 @@ MODULE_EXT =dll
CSFILES = $(srcdir)/GnomeKeyring.cs
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
-CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp
+CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp-2.0
CS_RESOURCES =
CS_LIBS =
CS_LIBPATH =
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.in CASA-1.6.659/c_adlib/ad_gk/Makefile.in
--- CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/Makefile.in 2007-02-05 14:53:58.000000000 +0100
@@ -217,7 +217,7 @@ MODULE_NAME = Novell.CASA.DataEngines.Gn
MODULE_EXT = dll
CSFILES = $(srcdir)/GnomeKeyring.cs
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
-CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp
+CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp-2.0
CS_RESOURCES =
CS_LIBS =
CS_LIBPATH =
diff -pruN CASA-1.6.659.orig/c_adlib/Makefile.am CASA-1.6.659/c_adlib/Makefile.am
--- CASA-1.6.659.orig/c_adlib/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/Makefile.am 2007-02-05 14:53:58.000000000 +0100
@@ -56,7 +56,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \
$(top_srcdir)/c_gui/Logger.cs
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
-CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp /d:LINUX
+CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp-2.0 /d:LINUX
CS_RESOURCES =
CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.KWallet.dll \
diff -pruN CASA-1.6.659.orig/c_adlib/Makefile.in CASA-1.6.659/c_adlib/Makefile.in
--- CASA-1.6.659.orig/c_adlib/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/Makefile.in 2007-02-05 14:53:58.000000000 +0100
@@ -226,7 +226,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \
$(top_srcdir)/c_gui/Logger.cs
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
-CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp /d:LINUX
+CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp-2.0 /d:LINUX
CS_RESOURCES =
CS_LIBS = $(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.KWallet.dll \
diff -pruN CASA-1.6.659.orig/c_gui/Makefile.am CASA-1.6.659/c_gui/Makefile.am
--- CASA-1.6.659.orig/c_gui/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_gui/Makefile.am 2007-02-05 14:55:37.000000000 +0100
@@ -74,7 +74,7 @@ CSFILES =$(srcdir)/AssemblyInfo.cs \
$(srcdir)/Common.cs
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
-CS_FLAGS = -pkg:gtk-sharp -pkg:glade-sharp -d:LINUX -nowarn:169
+CS_FLAGS = -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -d:LINUX -nowarn:169
CS_RESOURCES =
CS_LIBS =$(CASALIBDIR)/Novell.CASA.Common.dll \
$(CASALIBDIR)/Novell.CASA.miCASAWrapper.dll \
diff -pruN CASA-1.6.659.orig/c_gui/Makefile.in CASA-1.6.659/c_gui/Makefile.in
--- CASA-1.6.659.orig/c_gui/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_gui/Makefile.in 2007-02-05 14:55:37.000000000 +0100
@@ -241,7 +241,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \
$(srcdir)/Common.cs
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
-CS_FLAGS = -pkg:gtk-sharp -pkg:glade-sharp -d:LINUX -nowarn:169
+CS_FLAGS = -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -d:LINUX -nowarn:169
CS_RESOURCES =
CS_LIBS = $(CASALIBDIR)/Novell.CASA.Common.dll \
$(CASALIBDIR)/Novell.CASA.miCASAWrapper.dll \
diff -pruN CASA-1.6.659.orig/make/defaults.lux CASA-1.6.659/make/defaults.lux
--- CASA-1.6.659.orig/make/defaults.lux 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/make/defaults.lux 2007-02-05 14:55:37.000000000 +0100
@@ -39,7 +39,7 @@ ifeq ($(module),kwwrap)
endif
ifeq ($(module),gkwrap)
- CFLAGS = /target:"library" -pkg:gtk-sharp
+ CFLAGS = /target:"library" -pkg:gtk-sharp-2.0
OFILE = -out:"$(CSLIBDIR)$@"dll
EXT = dll
endif
@@ -51,7 +51,7 @@ ifeq ($(module),ffwrap)
endif
ifeq ($(module),adlib)
- CFLAGS = /target:"library" -pkg:gtk-sharp -lib:"$(CSLIBDIR)" -lib:../c_adlib/ad_gk/ -lib:../c_adlib/ad_kw/ -lib:../c_adlib/ad_ff/ /r:Novell.CASA.DataEngines.GnomeKeyring.dll /r:Novell.CASA.DataEngines.KWallet.dll /r:Novell.CASA.DataEngines.FireFox.dll /r:Novell.CASA.CASAPolicy.dll /r:Novell.CASA.miCASAWrapper.dll
+ CFLAGS = /target:"library" -pkg:gtk-sharp-2.0 -lib:"$(CSLIBDIR)" -lib:../c_adlib/ad_gk/ -lib:../c_adlib/ad_kw/ -lib:../c_adlib/ad_ff/ /r:Novell.CASA.DataEngines.GnomeKeyring.dll /r:Novell.CASA.DataEngines.KWallet.dll /r:Novell.CASA.DataEngines.FireFox.dll /r:Novell.CASA.CASAPolicy.dll /r:Novell.CASA.miCASAWrapper.dll
OFILE = -out:"$(CSLIBDIR)$@"dll
EXT = dll
endif
@@ -63,13 +63,13 @@ ifeq ($(module),csssd)
endif
ifeq ($(module),casamanager)
- CFLAGS = -lib:../c_micasad/test/dependencies/ -lib:"$(CSLIBDIR)" /r:$(CSLIBDIR)Novell.CASA.miCASAWrapper.dll /r:Novell.CASA.A-D.dll /r:Novell.CASA.CASAPolicy.dll -pkg:gtk-sharp -pkg:glade-sharp /r:Novell.CASA.Common.dll
+ CFLAGS = -lib:../c_micasad/test/dependencies/ -lib:"$(CSLIBDIR)" /r:$(CSLIBDIR)Novell.CASA.miCASAWrapper.dll /r:Novell.CASA.A-D.dll /r:Novell.CASA.CASAPolicy.dll -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 /r:Novell.CASA.Common.dll
OFILE = -out:"$(CSBINDIR)$@"exe
EXT = bin
endif
ifeq ($(module),trayapp)
- CFLAGS = -lib:../c_micasad/test/dependencies/ -pkg:gtk-sharp -lib:"$(CSLIBDIR)" /r:Novell.CASA.Common.dll -pkg:glade-sharp /r:Novell.CASA.miCASAWrapper.dll
+ CFLAGS = -lib:../c_micasad/test/dependencies/ -pkg:gtk-sharp-2.0 -lib:"$(CSLIBDIR)" /r:Novell.CASA.Common.dll -pkg:glade-sharp-2.0 /r:Novell.CASA.miCASAWrapper.dll
OFILE = -out:"$(CSBINDIR)$@"exe
EXT = bin
endif

275
branches/experimental/sys-auth/CASA/files/CASA-1.6-gnome.patch
View File

@ -1,275 +0,0 @@
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -58,7 +58,7 @@ CXXFILES = $(srcdir)/Common.cpp \
CXXFILES_CXX :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
--I/opt/gnome/include/gnome-keyring-1
+-I/usr/include/gnome-keyring-1
CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES)
EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -227,7 +227,7 @@ CXXFILES = $(srcdir)/Common.cpp \
CXXFILES_CXX :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
--I/opt/gnome/include/gnome-keyring-1
+-I/usr/include/gnome-keyring-1
CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES)
EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/native/link.lux CASA-1.6.659/c_adlib/ad_gk/native/link.lux
--- CASA-1.6.659.orig/c_adlib/ad_gk/native/link.lux 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/native/link.lux 2007-02-05 14:19:21.000000000 +0100
@@ -5,7 +5,7 @@ LINK = $(CPP) \
-O2 -fno-exceptions -fno-check-new\
-Wl,-rpath -Wl,/usr/lib$(ARC) \
-L/usr/lib$(ARC) -lpthread -lc -ldl \
- -L/opt/gnome/lib$(ARC) -lglib-2.0 \
+ -L/usr/lib$(ARC) -lglib-2.0 \
-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
-L$(LIBDIR)$(XTRA) \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.am CASA-1.6.659/c_adlib/ad_gk/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/native/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -51,10 +51,10 @@ LIBDIR = $(LIB)
CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
- -I/opt/gnome/include/gnome-keyring-1 \
- -I/opt/gnome/include/glib-2.0 \
- -I/opt/gnome/$(LIBDIR)/glib-2.0/include \
- -L/opt/gnome/$(LIBDIR) -lglib-2.0
+ -I/usr/include/gnome-keyring-1 \
+ -I/usr/include/glib-2.0 \
+ -I/usr/$(LIBDIR)/glib-2.0/include \
+ -L/usr/$(LIBDIR) -lglib-2.0
RESOURCES =
EXTRA_CFLAGS =
@@ -64,7 +64,7 @@ LIBS = -lpthread -ldl
LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1
-EXTRA_LDFLAGS = -L/opt/gnome/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
+EXTRA_LDFLAGS = -L/usr/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
OBJDIR = ./$(TARGET_CFG)/$(LIBDIR)
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.in CASA-1.6.659/c_adlib/ad_gk/native/Makefile.in
--- CASA-1.6.659.orig/c_adlib/ad_gk/native/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_gk/native/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -220,14 +220,14 @@ CFILES = $(srcdir)/ad_gk.c
LIBDIR = $(LIB)
CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
- -I/opt/gnome/include/gnome-keyring-1 \
- -I/opt/gnome/include/glib-2.0 \
- -I/opt/gnome/$(LIBDIR)/glib-2.0/include \
- -L/opt/gnome/$(LIBDIR) -lglib-2.0
+ -I/usr/include/gnome-keyring-1 \
+ -I/usr/include/glib-2.0 \
+ -I/usr/$(LIBDIR)/glib-2.0/include \
+ -L/usr/$(LIBDIR) -lglib-2.0
RESOURCES =
EXTRA_CFLAGS =
-EXTRA_LDFLAGS = -L/opt/gnome/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
+EXTRA_LDFLAGS = -L/usr/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR)
OBJDIR = ./$(TARGET_CFG)/$(LIBDIR)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
EXTRA_DIST = $(CFILES) *.h
diff -pruN CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -56,7 +56,7 @@ CXX_MOC_FILES = kwallets_rw.moc
CXXFILES_CXX :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
--I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/opt/gnome/include/gnome-keyring-1/
+-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/usr/include/gnome-keyring-1/
CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES)
EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
diff -pruN CASA-1.6.659.orig/c_common/linux/Makefile.am CASA-1.6.659/c_common/linux/Makefile.am
--- CASA-1.6.659.orig/c_common/linux/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_common/linux/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -47,7 +47,7 @@ MODULE_EXT =o
CFILES = ../sscs_ll.c
CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
EXTRA_CFLAGS =
RESOURCES =
CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_common/linux/Makefile.in CASA-1.6.659/c_common/linux/Makefile.in
--- CASA-1.6.659.orig/c_common/linux/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_common/linux/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -217,7 +217,7 @@ MODULE_NAME = sscs_ll
MODULE_EXT = o
CFILES = ../sscs_ll.c
CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
EXTRA_CFLAGS =
RESOURCES =
OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.am CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.am
--- CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -50,7 +50,7 @@ CFILES = ../jmicasa.c
CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
- -I/opt/gnome/include/gnome-keyring-1
+ -I/usr/include/gnome-keyring-1
RESOURCES =
DEFINES =
CFLAGS += $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.in CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.in
--- CASA-1.6.659.orig/c_jwrapper/jnsscs/linux/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_jwrapper/jnsscs/linux/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -220,7 +220,7 @@ MODULE_EXT = so
CFILES = ../jmicasa.c
CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
- -I/opt/gnome/include/gnome-keyring-1
+ -I/usr/include/gnome-keyring-1
RESOURCES =
DEFINES =
diff -pruN CASA-1.6.659.orig/c_micasacache/linux/Makefile.am CASA-1.6.659/c_micasacache/linux/Makefile.am
--- CASA-1.6.659.orig/c_micasacache/linux/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasacache/linux/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -49,7 +49,7 @@ CFILES = ../sscs_unx_cache.c \
../sscs_ipc.c
CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
EXTRA_CFLAGS =
RESOURCES =
CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_micasacache/linux/Makefile.in CASA-1.6.659/c_micasacache/linux/Makefile.in
--- CASA-1.6.659.orig/c_micasacache/linux/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasacache/linux/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -220,7 +220,7 @@ CFILES = ../sscs_unx_cache.c \
../sscs_ipc.c
CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
EXTRA_CFLAGS =
RESOURCES =
OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/c_micasadk/linux/Makefile.am CASA-1.6.659/c_micasadk/linux/Makefile.am
--- CASA-1.6.659.orig/c_micasadk/linux/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasadk/linux/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -51,7 +51,7 @@ CFILES = ../sscs_ll.c \
../sscs_ndk.c
CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
EXTRA_CFLAGS =
RESOURCES =
CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/c_micasadk/linux/Makefile.in CASA-1.6.659/c_micasadk/linux/Makefile.in
--- CASA-1.6.659.orig/c_micasadk/linux/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_micasadk/linux/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -224,7 +224,7 @@ CFILES = ../sscs_ll.c \
../sscs_ndk.c
CSFILES_CSC :=
-INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1/
+INCLUDES = -I. -I.. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1/
EXTRA_CFLAGS =
RESOURCES =
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
diff -pruN CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.am CASA-1.6.659/login_capture/PAM/linux/Makefile.am
--- CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.am 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/login_capture/PAM/linux/Makefile.am 2007-02-05 14:19:21.000000000 +0100
@@ -49,7 +49,7 @@ CFILES = ../pam_sscs_utils.c \
../pam_sscs.c
CSFILES_CSC :=
-INCLUDES = -I. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1
+INCLUDES = -I. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1
RESOURCES =
DEFINES= -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES)
diff -pruN CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.in CASA-1.6.659/login_capture/PAM/linux/Makefile.in
--- CASA-1.6.659.orig/login_capture/PAM/linux/Makefile.in 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/login_capture/PAM/linux/Makefile.in 2007-02-05 14:19:21.000000000 +0100
@@ -221,7 +221,7 @@ CFILES = ../pam_sscs_utils.c \
../pam_sscs.c
CSFILES_CSC :=
-INCLUDES = -I. -I$(CASAROOT)/include -I/opt/gnome/include/gnome-keyring-1
+INCLUDES = -I. -I$(CASAROOT)/include -I/usr/include/gnome-keyring-1
RESOURCES =
DEFINES = -fno-strict-aliasing
OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/make/global.mak CASA-1.6.659/make/global.mak
--- CASA-1.6.659.orig/make/global.mak 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/make/global.mak 2007-02-05 14:19:21.000000000 +0100
@@ -61,7 +61,7 @@ incdir = i"." i"$(ROOT)/include" i"$(NWS
endif
ifeq ($(PLAT),lux)
-incdir = i"." i"$(ROOT)/include" i"/opt/gnome/include/gnome-keyring-1/"
+incdir = i"." i"$(ROOT)/include" i"/usr/include/gnome-keyring-1/"
O = o
endif
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/CASA-detect_lib64.patch CASA-1.6.659/shsrc/lshsrc/CASA-detect_lib64.patch
--- CASA-1.6.659.orig/shsrc/lshsrc/CASA-detect_lib64.patch 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/CASA-detect_lib64.patch 2007-02-05 14:19:21.000000000 +0100
@@ -282,7 +282,7 @@
-fi
+ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"`
- export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+ export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
--- shsrc/lshsrc/mk-micasa_gk-ol
+++ shsrc/lshsrc/mk-micasa_gk-ol
@@ -298,7 +298,7 @@
-fi
+ARCH_LIB=`ldd /bin/bash | sed -ne "s@.* /lib\([^/]*\)/libc.so.*@\1@p"`
- export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+ export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
--- shsrc/lshsrc/mk-micasa_gkwrap-dl
+++ shsrc/lshsrc/mk-micasa_gkwrap-dl
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-dl CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-dl
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-dl 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-dl 2007-02-05 14:19:21.000000000 +0100
@@ -19,7 +19,7 @@ else
ARCH_LIB=
fi
-export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
#cd $PR/c_common
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-ol CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-ol
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_gk-ol 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_gk-ol 2007-02-05 14:19:21.000000000 +0100
@@ -19,7 +19,7 @@ else
ARCH_LIB=
fi
-export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
+export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/usr/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
cd $PR/c_adlib/ad_gk/native
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)

90
branches/experimental/sys-auth/CASA/files/CASA-1.6-qt.patch
View File

@ -1,90 +0,0 @@
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.am 2007-02-05 14:32:12.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.am 2007-02-05 14:35:28.000000000 +0100
@@ -68,7 +68,7 @@ LIBS = -lpthread -ldl -L/opt/kde3/lib
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-soname -Wl,libkwallets_rw.so.1
-EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)
+EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/qt/3/$(LIB)
OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in
--- CASA-1.6.659.orig/c_adlib/ad_ff/native/Makefile.in 2007-02-05 14:32:12.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_ff/native/Makefile.in 2007-02-05 14:35:28.000000000 +0100
@@ -235,7 +235,7 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINU
-DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
CXX_RESOURCES =
-EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)
+EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/qt/3/$(LIB)
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o))
CUR_DIR := $(shell pwd)
diff -pruN CASA-1.6.659.orig/c_adlib/ad_kw/native/link.lux CASA-1.6.659/c_adlib/ad_kw/native/link.lux
--- CASA-1.6.659.orig/c_adlib/ad_kw/native/link.lux 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_kw/native/link.lux 2007-02-05 14:35:28.000000000 +0100
@@ -7,7 +7,7 @@ LINK = $(CPP) \
-L/usr/lib$(ARC) -lpthread -lc -ldl \
-L/opt/kde3/lib$(ARC) -lkwalletclient -lqt-mt \
-L/usr/X11R6/lib$(ARC) \
- -L/usr/lib/qt3/lib$(ARC) -lqt-mt \
+ -L/usr/qt/3/lib$(ARC) -lqt-mt \
-Wl,-soname -Wl,lib$(TARGET).so.$(PROD_NUM) \
-o $(LIBDIR)$(XTRA)/lib$(TARGET).so.$(BLD_VER) \
-L$(LIBDIR)$(XTRA) \
diff -pruN CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am
--- CASA-1.6.659.orig/c_adlib/ad_kw/native/Makefile.am 2007-02-05 14:32:12.000000000 +0100
+++ CASA-1.6.659/c_adlib/ad_kw/native/Makefile.am 2007-02-05 14:35:28.000000000 +0100
@@ -44,7 +44,7 @@ PLATFORMINDEPENDENTSOURCEDIR =
PLATFORMDEPENDENTSOURCEDIR = .
####this needs to be defined in configure.in
-MOC = /usr/lib/qt3/bin/moc
+MOC = /usr/qt/3/bin/moc
CXX = g++
MODULE_NAME =libkwallets_rw
@@ -56,7 +56,7 @@ CXX_MOC_FILES = kwallets_rw.moc
CXXFILES_CXX :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include \
--I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/usr/include/gnome-keyring-1/
+-I/opt/kde3/include -I/usr/qt/3/include -I/usr/X11R6/include -I/usr/include/gnome-keyring-1/
CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES)
EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
@@ -67,7 +67,7 @@ LDFLAGS = -fno-exception -fno-check-new
-Wl,-soname -Wl,libkwallets_rw.so.1
EXTRA_LDFLAGS = -L/opt/kde3/$(LIB) -lkwalletclient \
- -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB) -lqt-mt
+ -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/qt/3/$(LIB) -lqt-mt
OBJDIR = ./$(TARGET_CFG)/$(LIB)
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-dl CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-dl
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-dl 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-dl 2007-02-05 14:35:28.000000000 +0100
@@ -24,7 +24,7 @@ fi
#(ln -f $COMMON_FILES $PR/c_micasadk)
cd $PR/c_adlib/ad_kw/native
moc kwallets_rw.h -o kwallets_rw.moc
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -DDEBUG -g" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=dbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/qt/3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -DDEBUG -g" $2 $3 $4 $5)
RCODE=$?
rm kwallets_rw.moc
rm -f $COMMON_FILES
diff -pruN CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-ol CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-ol
--- CASA-1.6.659.orig/shsrc/lshsrc/mk-micasa_kw-ol 2007-02-05 14:17:50.000000000 +0100
+++ CASA-1.6.659/shsrc/lshsrc/mk-micasa_kw-ol 2007-02-05 14:35:28.000000000 +0100
@@ -24,7 +24,7 @@ fi
#(ln -f $COMMON_FILES $PR/c_micasadk)
cd $PR/c_adlib/ad_kw/native
moc kwallets_rw.h -o kwallets_rw.moc
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/qt/3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g" $2 $3 $4 $5)
RCODE=$?
rm -f $COMMON_FILES
rm kwallets_rw.moc