pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fixed Makefile xapps
Module Name: pkgsrc-wip
Committed By: jaypatelani <jaypatelani%gmail.com@localhost>
Pushed By: jaypatelani
Date: Fri Sep 4 10:35:03 2020 +0530
Changeset: 184c15cb686508e09aff137e649f5a62ba1f8452
Modified Files:
xapps/Makefile
Added Files:
xapps/backupmakefile
Removed Files:
xapps/Makefile.bkup
xapps/patch-files_meson.build.orig.bkup
xapps/patch-libxapp_meson.build.orig.bkup
xapps/patch-pygobject_meson.build.orig.bkup
Log Message:
fixed Makefile xapps
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=184c15cb686508e09aff137e649f5a62ba1f8452
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
xapps/Makefile | 14 ++++----
xapps/Makefile.bkup | 50 -----------------------------
xapps/backupmakefile | 50 +++++++++++++++++++++++++++++
xapps/patch-files_meson.build.orig.bkup | 19 -----------
xapps/patch-libxapp_meson.build.orig.bkup | 15 ---------
xapps/patch-pygobject_meson.build.orig.bkup | 15 ---------
6 files changed, 56 insertions(+), 107 deletions(-)
diffs:
diff --git a/xapps/Makefile b/xapps/Makefile
index 2eed056c22..b2f9ee030a 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -11,18 +11,16 @@ HOMEPAGE= https://github.com/linuxmint/xapps
COMMENT= Components which are common to multiple desktop environments
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
-DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
+USE_TOOLS= pkg-config intltool
+USE_CMAKE= yes
+USE_LANGUAGES= c c++ fortran
+WRKSRC= ${WRKDIR}/xapp-1.8.9
+USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake bash pkg-config intltool msgfmt
-
-#REPLACE_BASH= files/usr/bin/xfce4-set-wallpaper
-
-pre-install:
- ${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
.include "../../devel/meson/build.mk"
+.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
.include "../../devel/glib2/schemas.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../devel/py-gobject3-common/buildlink3.mk"
diff --git a/xapps/Makefile.bkup b/xapps/Makefile.bkup
deleted file mode 100644
index a37e69752c..0000000000
--- a/xapps/Makefile.bkup
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
-
-DISTNAME= xapps-1.8.9
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
-GITHUB_PROJECT= xapps
-GITHUB_TAG= ${PKGVERSION_NOREV}
-
-MAINTAINER= youri%NetBSD.org@localhost
-HOMEPAGE= https://github.com/linuxmint/xapps
-COMMENT= Components which are common to multiple desktop environments
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
-
-DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-
-#SUBST_CLASSES= pypath
-#SUBST_STAGE.pypath= pre-configure
-#SUBST_FILES.pypath= pygobject/meson.build files/meson.build
-#SUBST_VARS.pypath= PREFIX PYTHONBIN
-
-PY_PATCHPLIST= yes
-
-MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
-
-USE_TOOLS+= gmake bash pkg-config intltool msgfmt
-
-REPLACE_PYTHON= schemas/meson_install_schemas.py \
- files/usr/bin/pastebin \
- files/usr/bin/upload-system-info
-
-REPLACE_BASH= files/usr/bin/xfce4-set-wallpaper
-
-pre-install:
- ${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
-
-.include "../../devel/meson/build.mk"
-.include "../../devel/glib2/schemas.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/py-gobject3-common/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/vala/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../x11/libgnomekbd/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/xapps/backupmakefile b/xapps/backupmakefile
new file mode 100644
index 0000000000..a37e69752c
--- /dev/null
+++ b/xapps/backupmakefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME= xapps-1.8.9
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT= xapps
+GITHUB_TAG= ${PKGVERSION_NOREV}
+
+MAINTAINER= youri%NetBSD.org@localhost
+HOMEPAGE= https://github.com/linuxmint/xapps
+COMMENT= Components which are common to multiple desktop environments
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
+
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
+#SUBST_CLASSES= pypath
+#SUBST_STAGE.pypath= pre-configure
+#SUBST_FILES.pypath= pygobject/meson.build files/meson.build
+#SUBST_VARS.pypath= PREFIX PYTHONBIN
+
+PY_PATCHPLIST= yes
+
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
+
+USE_TOOLS+= gmake bash pkg-config intltool msgfmt
+
+REPLACE_PYTHON= schemas/meson_install_schemas.py \
+ files/usr/bin/pastebin \
+ files/usr/bin/upload-system-info
+
+REPLACE_BASH= files/usr/bin/xfce4-set-wallpaper
+
+pre-install:
+ ${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
+
+.include "../../devel/meson/build.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xapps/patch-files_meson.build.orig.bkup b/xapps/patch-files_meson.build.orig.bkup
deleted file mode 100644
index 7444e9cbf5..0000000000
--- a/xapps/patch-files_meson.build.orig.bkup
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Destdir support.
-
---- files/meson.build.orig 2018-05-06 13:34:47.000000000 +0000
-+++ files/meson.build
-@@ -1,7 +1,10 @@
- message('Copying ./files structure')
-
--install_subdir('usr',
-- install_dir: '/',
-+install_subdir('usr/bin',
-+ install_dir: '@PREFIX@',
-+)
-+install_subdir('usr/share',
-+ install_dir: '@PREFIX@',
- )
-
-
diff --git a/xapps/patch-libxapp_meson.build.orig.bkup b/xapps/patch-libxapp_meson.build.orig.bkup
deleted file mode 100644
index 83e07e61b9..0000000000
--- a/xapps/patch-libxapp_meson.build.orig.bkup
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Don't add non-portable ld arguments.
-
---- libxapp/meson.build.orig 2018-11-27 18:17:01.000000000 +0000
-+++ libxapp/meson.build
-@@ -45,7 +45,7 @@ libxapp = library('xapp',
- soversion: '1',
- dependencies: libdeps,
- c_args: ['-Wno-declaration-after-statement'],
-- link_args: [ '-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now', '-lm'],
-+ link_args: [ '-Wl,-Bsymbolic', '-lm'],
- install: true
- )
-
diff --git a/xapps/patch-pygobject_meson.build.orig.bkup b/xapps/patch-pygobject_meson.build.orig.bkup
deleted file mode 100644
index fa75b3b108..0000000000
--- a/xapps/patch-pygobject_meson.build.orig.bkup
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Adjust python path.
-
---- pygobject/meson.build.orig 2018-05-06 13:34:47.000000000 +0000
-+++ pygobject/meson.build
-@@ -3,7 +3,7 @@ pygobject = dependency('pygobject-3.0',
- required: true,
- )
-
--foreach exec : ['python2', 'python3']
-+foreach exec : ['@PYTHONBIN@']
- r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)')
-
- if r.returncode() == 0
Home |
Main Index |
Thread Index |
Old Index