mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 03:27:14 +08:00
missed committing polkit changes to move to console-kit free installs, add js, new dep
This commit is contained in:
abveritas
parent
316d0d3652
commit
ff8124934c
41
js/PKGBUILD
Normal file
41
js/PKGBUILD
Normal file
@ -0,0 +1,41 @@
|
||||
#
|
||||
# Desktop Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=js
|
||||
pkgver=1.8.5
|
||||
pkgrel=1
|
||||
pkgdesc="JavaScript interpreter and libraries"
|
||||
arch=('x86_64')
|
||||
url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
|
||||
license=('GPL2')
|
||||
depends=('nspr' 'gcc-libs')
|
||||
makedepends=('python2' 'zip')
|
||||
replaces=('spidermonkey')
|
||||
conflicts=('spidermonkey')
|
||||
source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
|
||||
js185-destdir.patch)
|
||||
md5sums=('a4574365938222adca0a6bd33329cb32'
|
||||
'364834a8391888642c53d78c3a949d94')
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver/js/src"
|
||||
|
||||
patch -p0 -i $srcdir/js185-destdir.patch
|
||||
|
||||
./configure --prefix=/usr --with-system-nspr \
|
||||
--enable-threadsafe
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver/js/src"
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
install -m 0755 shell/js ${pkgdir}/usr/bin
|
||||
|
||||
#cleanup
|
||||
rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a"
|
||||
}
|
||||
|
||||
15
js/js185-destdir.patch
Normal file
15
js/js185-destdir.patch
Normal file
@ -0,0 +1,15 @@
|
||||
#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
|
||||
|
||||
--- Makefile.in.old 2011-04-10 04:21:19.918608008 -0700
|
||||
+++ Makefile.in 2011-04-10 04:21:58.088607992 -0700
|
||||
@@ -888,8 +888,8 @@
|
||||
ifeq (,$(HOST_BIN_SUFFIX))
|
||||
mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
|
||||
@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
|
||||
- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
|
||||
- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
|
||||
+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
|
||||
+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
|
||||
endif
|
||||
endif
|
||||
ifneq (,$(IMPORT_LIBRARY))
|
||||
43
polkit/PKGBUILD
Normal file
43
polkit/PKGBUILD
Normal file
@ -0,0 +1,43 @@
|
||||
#
|
||||
# Desktop Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=polkit
|
||||
pkgver=0.107
|
||||
pkgrel=1
|
||||
pkgdesc="Application development toolkit for controlling system-wide privileges"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('LGPL')
|
||||
url="http://www.freedesktop.org/wiki/Software/polkit"
|
||||
depends=('glib2' 'pam' 'expat>=2.0.1' 'systemd' 'js')
|
||||
makedepends=('intltool>=0.41.1' 'gobject-introspection>=0.9.5' 'docbook-xsl')
|
||||
replaces=('policykit')
|
||||
options=('!libtool')
|
||||
install=polkit.install
|
||||
source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
|
||||
polkit.pam)
|
||||
#disable-gtk-doc.patch)
|
||||
md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
|
||||
'6564f95878297b954f0572bc1610dd15')
|
||||
#'ad88086ef2b04fec5b69118ca3d47801')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
#patch -Np1 -i "${srcdir}/disable-gtk-doc.patch"
|
||||
./configure --prefix=/usr --sysconfdir=/etc \
|
||||
--localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
|
||||
--with-systemdsystemunitdir=/usr/lib/systemd/system \
|
||||
--disable-static --with-os-type=chakra
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
chown 102 "$pkgdir/etc/polkit-1/rules.d"
|
||||
chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
|
||||
|
||||
install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit-1"
|
||||
}
|
||||
12
polkit/configure-fix.patch
Normal file
12
polkit/configure-fix.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Naur polkit-0.98-orig/configure polkit-0.98/configure
|
||||
--- polkit-0.98-orig/configure 2010-10-17 17:33:00.000000000 +0000
|
||||
+++ polkit-0.98/configure 2010-10-17 17:36:49.732999997 +0000
|
||||
@@ -12426,7 +12426,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-GTK_DOC_CHECK(1.3)
|
||||
+#GTK_DOC_CHECK(1.3)
|
||||
|
||||
#### gcc warning flags
|
||||
|
||||
19
polkit/disable-gtk-doc.patch
Normal file
19
polkit/disable-gtk-doc.patch
Normal file
@ -0,0 +1,19 @@
|
||||
diff -Naur polkit-0.98-orig/docs/polkit/Makefile.am polkit-0.98/docs/polkit/Makefile.am
|
||||
--- polkit-0.98-orig/docs/polkit/Makefile.am 2010-08-06 17:25:37.000000000 +0000
|
||||
+++ polkit-0.98/docs/polkit/Makefile.am 2010-10-17 17:28:13.943999998 +0000
|
||||
@@ -80,11 +80,11 @@
|
||||
# Extra options to supply to gtkdoc-fixref
|
||||
FIXXREF_OPTIONS=
|
||||
|
||||
-if ENABLE_GTK_DOC
|
||||
-include $(top_srcdir)/gtk-doc.make
|
||||
-else
|
||||
+#if ENABLE_GTK_DOC
|
||||
+#include $(top_srcdir)/gtk-doc.make
|
||||
+#else
|
||||
CLEANFILES =
|
||||
-endif
|
||||
+#endif
|
||||
|
||||
CLEANFILES += *~ \
|
||||
polkit-1-scan.* \
|
||||
85
polkit/polkit-git-fixes.patch
Normal file
85
polkit/polkit-git-fixes.patch
Normal file
@ -0,0 +1,85 @@
|
||||
diff --git a/src/polkit/polkitcheckauthorizationflags.h b/src/polkit/polkitcheckauthorizationflags.h
|
||||
index 94aa070..4baa0d1 100644
|
||||
--- a/src/polkit/polkitcheckauthorizationflags.h
|
||||
+++ b/src/polkit/polkitcheckauthorizationflags.h
|
||||
@@ -30,10 +30,6 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
-GType polkit_check_authorization_flags_get_type (void) G_GNUC_CONST;
|
||||
-
|
||||
-#define POLKIT_TYPE_CHECK_AUTHORIZATION_FLAGS (polkit_check_authorization_flags_get_type ())
|
||||
-
|
||||
/**
|
||||
* PolkitCheckAuthorizationFlags:
|
||||
* @POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE: No flags set.
|
||||
diff --git a/src/polkit/polkiterror.h b/src/polkit/polkiterror.h
|
||||
index b31583d..e49cabf 100644
|
||||
--- a/src/polkit/polkiterror.h
|
||||
+++ b/src/polkit/polkiterror.h
|
||||
@@ -40,10 +40,6 @@ G_BEGIN_DECLS
|
||||
|
||||
GQuark polkit_error_quark (void);
|
||||
|
||||
-GType polkit_error_get_type (void) G_GNUC_CONST;
|
||||
-
|
||||
-#define POLKIT_TYPE_ERROR (polkit_error_get_type ())
|
||||
-
|
||||
/**
|
||||
* PolkitError:
|
||||
* @POLKIT_ERROR_FAILED: The operation failed.
|
||||
diff --git a/src/polkit/polkitimplicitauthorization.h b/src/polkit/polkitimplicitauthorization.h
|
||||
index 9e5c51c..dee2611 100644
|
||||
--- a/src/polkit/polkitimplicitauthorization.h
|
||||
+++ b/src/polkit/polkitimplicitauthorization.h
|
||||
@@ -30,10 +30,6 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
-GType polkit_implicit_authorization_get_type (void) G_GNUC_CONST;
|
||||
-
|
||||
-#define POLKIT_TYPE_IMPLICIT_AUTHORIZATION (polkit_implicit_authorization_get_type ())
|
||||
-
|
||||
/**
|
||||
* PolkitImplicitAuthorization:
|
||||
* @POLKIT_IMPLICIT_AUTHORIZATION_UNKNOWN: Unknown whether the subject is authorized, never returned in any public API.
|
||||
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
|
||||
index d2fc9c8..96ffd7c 100644
|
||||
--- a/src/polkitagent/Makefile.am
|
||||
+++ b/src/polkitagent/Makefile.am
|
||||
@@ -46,6 +46,7 @@ libpolkit_agent_1includedir=$(includedir)/polkit-1/polkitagent
|
||||
|
||||
libpolkit_agent_1include_HEADERS = \
|
||||
polkitagent.h \
|
||||
+ polkitagentenumtypes.h \
|
||||
polkitagenttypes.h \
|
||||
polkitagentsession.h \
|
||||
polkitagentlistener.h \
|
||||
diff --git a/src/polkitagent/polkitagenthelperprivate.c b/src/polkitagent/polkitagenthelperprivate.c
|
||||
index d4495dd..8f0c878 100644
|
||||
--- a/src/polkitagent/polkitagenthelperprivate.c
|
||||
+++ b/src/polkitagent/polkitagenthelperprivate.c
|
||||
@@ -48,8 +48,8 @@ _polkit_clearenv (void)
|
||||
gboolean
|
||||
send_dbus_message (const char *cookie, const char *user)
|
||||
{
|
||||
- PolkitAuthority *authority;
|
||||
- PolkitIdentity *identity;
|
||||
+ PolkitAuthority *authority = NULL;
|
||||
+ PolkitIdentity *identity = NULL;
|
||||
GError *error;
|
||||
gboolean ret;
|
||||
|
||||
diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
|
||||
index e91ad84..495f752 100644
|
||||
--- a/src/polkitbackend/polkitbackendsessionmonitor.c
|
||||
+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
|
||||
@@ -116,7 +116,7 @@ static gboolean
|
||||
ensure_database (PolkitBackendSessionMonitor *monitor,
|
||||
GError **error)
|
||||
{
|
||||
- gboolean ret;
|
||||
+ gboolean ret = FALSE;
|
||||
|
||||
if (monitor->database != NULL)
|
||||
{
|
||||
18
polkit/polkit.install
Normal file
18
polkit/polkit.install
Normal file
@ -0,0 +1,18 @@
|
||||
post_install() {
|
||||
getent group polkitd >/dev/null || groupadd -g 102 polkitd
|
||||
getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
|
||||
passwd -l polkitd &>/dev/null
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
if getent passwd polkitd >/dev/null; then
|
||||
userdel polkitd
|
||||
fi
|
||||
if getent group polkitd >/dev/null; then
|
||||
groupdel polkitd
|
||||
fi
|
||||
}
|
||||
7
polkit/polkit.pam
Normal file
7
polkit/polkit.pam
Normal file
@ -0,0 +1,7 @@
|
||||
auth requisite pam_nologin.so
|
||||
auth required pam_env.so
|
||||
auth required pam_unix.so
|
||||
account required pam_unix.so
|
||||
session required pam_limits.so
|
||||
session required pam_unix.so
|
||||
password required pam_unix.so
|
||||
Loading…
Reference in New Issue
Block a user