Re: boost diff
On Wed, Nov 21, 2018 at 01:19:27PM +0100, Otto Moerbeek wrote:
> Hi,
>
> I am playing with boost contexts which is configured out by the current port.
> I am able to make execution_context and fcontext work on amd64. The first
> using a simple test program and the second using a non-trival program.
>
> The only actual change in boost itself is to use a mmap(...
> MMAP_STACK ...) for stack allocation. So I like to enable the
> disabled parts. They are not extensivly tested and some other parts
> might need a patch too (there are several classes creating stacks).
>
> At the moment I just like to know if I am taking the right approach
> port-wise. So, any comments or advise?
Total silence remember I'm a total ports newbie, I really could
use some guidance here. Is this the right approach for a port having
arch specific features and plist?
-Otto
>
> -Otto
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.75
> diff -u -p -r1.75 Makefile
> --- Makefile 11 Sep 2018 19:26:14 - 1.75
> +++ Makefile 21 Nov 2018 12:17:35 -
> @@ -7,7 +7,7 @@ COMMENT= free peer-reviewed portable C++
> VERSION= 1.66.0
> DISTNAME=boost_${VERSION:S/./_/g}
> PKGNAME= boost-${VERSION}
> -REVISION=0
> +REVISION=2
> CATEGORIES= devel
> MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=boost/}
> EXTRACT_SUFX=.tar.bz2
> @@ -45,11 +45,7 @@ BOOST_LIBS=boost_atomic-mt \
> boost_unit_test_framework-mt boost_unit_test_framework \
> boost_wserialization-mt boost_wserialization \
> boost_wave-mt \
> - boost_type_erasure-mt boost_type_erasure \
> -
> -.for _lib in ${BOOST_LIBS}
> -SHARED_LIBS+=${_lib} ${SO_VERSION}
> -.endfor
> + boost_type_erasure-mt boost_type_erasure
>
> HOMEPAGE=http://www.boost.org/
>
> @@ -63,6 +59,12 @@ WANTLIB += ${COMPILER_LIBCXX} bz2 c icud
>
> COMPILER= base-clang ports-gcc
>
> +.if ${MACHINE_ARCH} == "amd64"
> +PKG_ARGS+=-Damd64=1
> +.else
> +PKG_ARGS+=-Damd64=0
> +.endif
> +
> MODULES= lang/python
> MODPY_RUNDEP=No
>
> @@ -102,7 +104,24 @@ BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
> # 'context' and 'coroutine' use MD bits and miss support for Alpha,
> # PA-RISC, SPARC and SuperH. The author does not care
> # about adding support for Alpha and PA-RISC.
> +
> +.if ${MACHINE_ARCH} == "amd64"
> +BOOST_LIBS+= boost_context-mt \
> + boost_coroutine boost_coroutine-mt \
> + boost_fiber-mt \
> + boost_stacktrace_basic \
> + boost_stacktrace_basic-mt \
> + boost_stacktrace_addr2line \
> + boost_stacktrace_addr2line-mt \
> + boost_stacktrace_noop \
> + boost_stacktrace_noop-mt
> +.else
> BOOTSTRAP+= --without-libraries=context,coroutine,fiber,stacktrace
> +.endif
> +
> +.for _lib in ${BOOST_LIBS}
> +SHARED_LIBS+=${_lib} ${SO_VERSION}
> +.endfor
>
> PY2_BOOTSTRAP=
> --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_2} \
> --with-python-version=${MODPY_DEFAULT_VERSION_2} \
> Index: patches/patch-boost_context_fixedsize_stack_hpp
> ===
> RCS file: patches/patch-boost_context_fixedsize_stack_hpp
> diff -N patches/patch-boost_context_fixedsize_stack_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-boost_context_fixedsize_stack_hpp 21 Nov 2018 12:17:35
> -
> @@ -0,0 +1,34 @@
> +$OpenBSD$
> +
> +Index: boost/context/fixedsize_stack.hpp
> +--- boost/context/fixedsize_stack.hpp.orig
> boost/context/fixedsize_stack.hpp
> +@@ -26,6 +26,8 @@
> + # include BOOST_ABI_PREFIX
> + #endif
> +
> ++#include
> ++
> + namespace boost {
> + namespace context {
> +
> +@@ -42,8 +44,8 @@ class basic_fixedsize_stack { (public)
> + }
> +
> + stack_context allocate() {
> +-void * vp = std::malloc( size_);
> +-if ( ! vp) {
> ++void * vp = mmap(NULL, size_, PROT_READ | PROT_WRITE, MAP_PRIVATE |
> MAP_ANON | MAP_STACK, -1, 0);
> ++if ( vp == MAP_FAILED ) {
> + throw std::bad_alloc();
> + }
> + stack_context sctx;
> +@@ -62,7 +64,7 @@ class basic_fixedsize_stack { (public)
> + VALGRIND_STACK_DEREGISTER( sctx.valgrind_stack_id);
> + #endif
> + void * vp = static_cast< char * >( sctx.sp) - sctx.size;
> +-std::free( vp);
> ++munmap(vp, sctx.size);
> + }
> + };
> +
> Index: pkg/PFRAG.amd64
> ===
> RCS file: pkg/PFRAG.amd64
> diff -N pkg/PFRAG.amd64
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/PFRAG.amd64 21 Nov 2018 12:17:35 -
> @@ -0,0 +1,20 @@
> +lib/libboost_context-mt.a
> +@lib lib/libboost_context-mt.so.${LIBboost_context-mt_VERSION}
>
Re: math/pari: remove unless updated
On Fri, Nov 23, 2018 at 05:27:25PM -0500, Daniel Dickman wrote: > > > > On Nov 23, 2018, at 2:39 PM, Christian Weisgerber > > wrote: > > > > The math/pari port remains at version 2.1.7 from 2005 (!). In the > > meantime, upstream has released a stream of new versions up to > > 2.11.0 earlier this year. If there is so little interest in > > maintaining the port, we might as well delete it. > > there were a few attempts to update it but their were some perl dependencies > that have never been updated if i remember and so pari could not be updated. > > i’d rather delete those perl dependencies and update pari than delete pari. > There is a somehow "long" chain of reverse dependencies. - math/pari - math/p5-Math-Pari - math/p5-Math-BigInt-Pari - security/p5-Crypt-Random - security/p5-Crypt-DH - security/p5-Crypt-Primes - security/p5-Crypt-RSA - security/p5-Crypt-OpenPGP I see that math/p5-Math-Pari recently got upstream update (15 Sep 2018: 2.030507) According to the README of Math-Pari, it means the perl module should fully support at least pari-2.3.4: Integer part and the first 4 digits after the point in the version of Math::Pari reflect the latest version of GP/PARI it was tested with. (2.01080* still fully supports only 2.1.7, but mostly works with 2.3.* too.) It is a good thing, as latest pari update was stopped at the latest 2.1.* version because of incomptabilities with 2.3 branch. -- Sebastien Marie
Re: aarch64 bulk build report
On Thu, 22 Nov 2018 10:09:42 -0700 (MST)
phess...@openbsd.org wrote:
> http://build-failures.rhaalovely.net/aarch64/2018-11-18/games/dungeon-crawl.log
direct.cc:47:32: error: constant expression evaluates to -1 which cannot be
narrowed to type 'char' [-Wc++11-narrowing]
static const char xcomp[9] = { -1, 0, 1, -1, 0, 1, -1, 0, 1 };
^~
I guess char is unsigned on arm, like it is on powerpc. The last
powerpc bulk failed earlier...
On Sat, 17 Nov 2018 05:25:33 -0700 (MST)
lan...@openbsd.org wrote:
> http://build-failures.rhaalovely.net//powerpc/2018-11-01/games/dungeon-crawl.log
describe.cc: In function 'void randart_descpr(std::string&, const item_def&)':
describe.cc:325:26: error: 'strlen' was not declared in this scope
if (strlen( desc ) > 0)
^
...but if someone fixed the strlen, there would be char problems. I
have not played dungeon-crawl for several years. If my memory is
correct, the game assumes that char is signed (as on i386), and the
build was using gcc -fsigned-char if char was unsigned, but it was
probably a build of stone-soup.
OpenBSD has a newer version of games/dungeon-crawl as
games/stone-soup. (Both ports have no maintainers.) I see snapshot
packages of stone-soup on aarch64 and powerpc, so it might be possible
to play stone-soup on platforms where dungeon-crawl is broken.
--
George Koehler
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
On 11/23/18 7:05 PM, Max Fillinger wrote: Thanks for your help! * No MAINTAINER--do you want it? What does that entail? I want to keep this port working and up to date, if I can. But I won't be any help if someone has, for example, a problem on a non-i386/amd64 platform. * Made the building of your fixbugs.pbx more sane and in the appropriate places for the port. I added a comment explaining why we have a post-build and post-install. Your comment in the Makefile seems a bit misleading. fixbugs.pbx is for when you *don't* want the bugs of the original game. I'd suggest something like: # Create patch file to allow the user to disable bug-compatibility with # the original game. Alright, that's my misunderstanding of what the file does then. ~Brian
Re: math/pari: remove unless updated
> On Nov 23, 2018, at 5:40 PM, Olivier Taïbi wrote: > > I cannot see perl dependencies in the Makefile. > > math/p5-Math-Pari depends on pari. you need to look at the reverse dependencies.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/11/23 17:57:15 Modified files: math/z3: Makefile math/z3/patches: patch-scripts_mk_util_py Log message: Make better use of ports infrastructure, don't override optimization flags, use -fPIC to build shared objects on all archs.
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
Hi Max, Max Fillinger wrote on Sat, Nov 24, 2018 at 01:05:17AM +0100: >> * No MAINTAINER--do you want it? > What does that entail? I want to keep this port working and up to > date, if I can. That's exactly what being a good MAINTAINER means. > But I won't be any help if someone has, for example, a > problem on a non-i386/amd64 platform. If there is something you cannot solve or you are unsure about, you just ask for help. Nothing is wrong with a MAINTAINER who asks for help when he needs it. Yours, Ingo
Re: [WIP/NEW] 1oom - Master of Orion 1 engine
Thanks for your help! > * No MAINTAINER--do you want it? What does that entail? I want to keep this port working and up to date, if I can. But I won't be any help if someone has, for example, a problem on a non-i386/amd64 platform. > * Made the building of your fixbugs.pbx more sane and in the appropriate > places for the port. I added a comment explaining why we have a post-build > and post-install. Your comment in the Makefile seems a bit misleading. fixbugs.pbx is for when you *don't* want the bugs of the original game. I'd suggest something like: # Create patch file to allow the user to disable bug-compatibility with # the original game.
Re: [NEW] games/mvdsv 0.32
On 2018-11-23 13:47, Jeremie Courreges-Anglas wrote:
On Fri, Nov 23 2018, Jeremie Courreges-Anglas wrote:
On Fri, Oct 19 2018, Solene Rapenne wrote:
Tom Murphy wrote:
On Thu, Oct 04, 2018 at 12:11:01PM +0200, Solene Rapenne wrote:
> Small introduction for people reading ports@.
>
> mvdsv is a quake world game server. It has some features like allowing to
> record games from every player point of view. That can be played again in a
> quake client like ezquake.
>
> ok solene@
Thanks Solene and Stuart for their help! Attached is a new tarball
using
GH_TAGNAME and the correct DISTFILES settings.
-Tom
up
looks fine to me
The build system is not very portable. The configure script hardcodes
a bunch of arch-dependent logic which breaks on eg. sparc64:
../../src/pr_exec.c:1: error: -m32 is not supported by this
configuration
Also, Makefile.BSD contains:
--8<--
. if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
USE_ASM=-Did386
DO_CFLAGS += ${USE_ASM}
. endif
-->8--
It would be good to check that the port builds on i386 with assembly
enabled. Or you could wait for bulk build reports. ;)
Using devel/meson could be a nicer alternative to Makefile.BSD, which
looks a bit outdated (no curl support for example).
Using meson is cleaner since meson.build doesn't hardcode so much crap.
Also it autodetects system pcre instead of falling back to an ancient
bundled version. Updated tarball.
This builds much faster and cleaner with those changes. Works on my
amd64.
Thanks for that!
-Tom
Re: math/pari: remove unless updated
I cannot see perl dependencies in the Makefile. Here is an attempt at an updated port. It now depends on gmp (on pari's website they recommend the gmp kernel). The use of gmake is probably overkill. On Fri, Nov 23, 2018 at 05:27:25PM -0500, Daniel Dickman wrote: > > > > On Nov 23, 2018, at 2:39 PM, Christian Weisgerber > > wrote: > > > > The math/pari port remains at version 2.1.7 from 2005 (!). In the > > meantime, upstream has released a stream of new versions up to > > 2.11.0 earlier this year. If there is so little interest in > > maintaining the port, we might as well delete it. > > there were a few attempts to update it but their were some perl dependencies > that have never been updated if i remember and so pari could not be updated. > > i’d rather delete those perl dependencies and update pari than delete pari. > > > > > (2.1.7 fails to build with lld on i386 and there is no point in > > spending any effort on a historic version.) > > > > -- > > Christian "naddy" Weisgerber na...@mips.inka.de > > > pari-2.11.0.tgz Description: Binary data
Re: math/pari: remove unless updated
> On Nov 23, 2018, at 2:39 PM, Christian Weisgerber wrote: > > The math/pari port remains at version 2.1.7 from 2005 (!). In the > meantime, upstream has released a stream of new versions up to > 2.11.0 earlier this year. If there is so little interest in > maintaining the port, we might as well delete it. there were a few attempts to update it but their were some perl dependencies that have never been updated if i remember and so pari could not be updated. i’d rather delete those perl dependencies and update pari than delete pari. > > (2.1.7 fails to build with lld on i386 and there is no point in > spending any effort on a historic version.) > > -- > Christian "naddy" Weisgerber na...@mips.inka.de >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/11/23 14:15:07 Modified files: x11/kde4/libs : Makefile Log message: remove kate and konsole from TEST_DEPENDS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/11/23 14:08:39 Modified files: audio/ocp/patches: patch-configure Log message: fix fat-fingered diff
UPDATE: x11/kde-applications/okular (With KDE4 bits)
Information for inst:okular-18.08.2
Comment:
KDE document viewer
Description:
Okular is a universal document viewer based on KPDF for KDE 4.
It combines the excellent functionalities of KPDF with the
versatility of supporting different kind of documents, like PDF,
Postscript, DjVu, CHM, XPS, ePub and others.
Maintainer: KDE porting team
Please find attached KDE5 okular to replace KDE4 okular with the
following diff. It will zap all KDE4 bits in x11/KDE4 (expect meta/kde4
and x11/kde4/Makefile)
Ok to bring okular to KDE5?
Rafael.
Index: korundum/Makefile
===
RCS file: /cvs/ports/x11/kde4/korundum/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- korundum/Makefile 26 Oct 2018 16:16:24 - 1.23
+++ korundum/Makefile 23 Nov 2018 20:45:56 -
@@ -2,7 +2,7 @@
COMMENT = KDE bindings for Ruby
DISTNAME = korundum-${MODKDE4_VERSION}
-REVISION = 9
+REVISION = 10
WANTLIB = ${MODRUBY_WANTLIB}
WANTLIB += ${COMPILER_LIBCXX}
@@ -13,7 +13,7 @@ WANTLIB += ${KDE4LIB}/kcmutils ${KDE4LIB
WANTLIB += ${KDE4LIB}/kidletime ${KDE4LIB}/kio ${KDE4LIB}/knewstuff2
WANTLIB += ${KDE4LIB}/kprintutils ${KDE4LIB}/kpty ${KDE4LIB}/kutils
WANTLIB += ${KDE4LIB}/nepomuk
-WANTLIB += ${KDE4LIB}/okularcore ${KDE4LIB}/solid
+WANTLIB += ${KDE4LIB}/solid
WANTLIB += ${KDE4LIB}/smokeakonadi
WANTLIB += ${KDE4LIB}/smokebase
WANTLIB += ${KDE4LIB}/smokekdecore ${KDE4LIB}/smokekdeui
@@ -21,7 +21,7 @@ WANTLIB += ${KDE4LIB}/smokekfile ${KDE4L
WANTLIB += ${KDE4LIB}/smokeknewstuff2 ${KDE4LIB}/smokeknewstuff3
WANTLIB += ${KDE4LIB}/smokekparts ${KDE4LIB}/smokektexteditor
WANTLIB += ${KDE4LIB}/smokekutils ${KDE4LIB}/smokenepomuk
-WANTLIB += ${KDE4LIB}/smokeokular ${KDE4LIB}/smokeplasma
+WANTLIB += ${KDE4LIB}/smokeplasma
WANTLIB += ${KDE4LIB}/smokeqtcore ${KDE4LIB}/smokeqtdbus
WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqtnetwork
WANTLIB += ${KDE4LIB}/smokeqtopengl ${KDE4LIB}/smokeqtsql
Index: korundum/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/kde4/korundum/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- korundum/patches/patch-CMakeLists_txt 24 Apr 2013 12:18:23 -
1.1.1.1
+++ korundum/patches/patch-CMakeLists_txt 23 Nov 2018 20:45:56 -
@@ -2,8 +2,9 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
insert after searching for kde + qtruby
CMakeLists.txt.origThu Oct 25 10:24:34 2012
-+++ CMakeLists.txt Thu Oct 25 10:25:23 2012
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
@@ -5,6 +5,9 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
find_package(Ruby REQUIRED)
find_package(KDE4 REQUIRED)
@@ -12,5 +13,14 @@ insert after searching for kde + qtruby
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
find_package(Smoke REQUIRED
- COMPONENTS KdeCore
+ COMPONENTS KdeCore
KdeUi
+@@ -20,7 +23,7 @@ find_package(Smoke REQUIRED
+ Plasma
+ QtCore
+ Solid )
+-find_package(Smoke COMPONENTS Akonadi Okular Kate Soprano SopranoClient
SopranoServer Nepomuk )
++find_package(Smoke COMPONENTS Akonadi Kate Soprano SopranoClient
SopranoServer Nepomuk )
+ include(KDE4Defaults)
+ include_directories( ${KDE4_INCLUDES} ${SMOKE_INCLUDE_DIR}
${QTRUBY_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${SMOKE_KDECORE_INCLUDE_DIR} )
+
Index: korundum/pkg/PLIST
===
RCS file: /cvs/ports/x11/kde4/korundum/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- korundum/pkg/PLIST 27 Jun 2018 21:04:17 - 1.3
+++ korundum/pkg/PLIST 23 Nov 2018 20:45:56 -
@@ -15,8 +15,6 @@ ${MODRUBY_SITEDIR}/ktexteditor/
${MODRUBY_SITEDIR}/ktexteditor/ktexteditor.rb
${MODRUBY_SITEDIR}/nepomuk/
${MODRUBY_SITEDIR}/nepomuk/nepomuk.rb
-${MODRUBY_SITEDIR}/okular/
-${MODRUBY_SITEDIR}/okular/okular.rb
${MODRUBY_SITEDIR}/solid/
${MODRUBY_SITEDIR}/solid/solid.rb
${MODRUBY_SITEDIR}/soprano/
@@ -27,7 +25,6 @@ ${MODRUBY_SITEARCHDIR}/kio.so
${MODRUBY_SITEARCHDIR}/korundum4.so
${MODRUBY_SITEARCHDIR}/ktexteditor.so
${MODRUBY_SITEARCHDIR}/nepomuk.so
-${MODRUBY_SITEARCHDIR}/okular.so
${MODRUBY_SITEARCHDIR}/plasma_applet.so
${MODRUBY_SITEARCHDIR}/solid.so
${MODRUBY_SITEARCHDIR}/soprano.so
@@ -44,6 +41,8 @@ share/apps/plasma_ruby_digital_clock/
share/apps/plasma_ruby_digital_clock/calendar.rb
share/apps/plasma_ruby_digital_clock/clock.rb
share/apps/plasma_ruby_digital_clock/digital_clock_config.rb
+share/kde4/
+share/kde4/services/
share/kde4/services/plasma-applet-ruby-analogclock.desktop
share/kde4/services/plasma-ruby-digital-clock-default.desktop
@tag update-desktop-database
Index: p5-kde/Makefile
===
RCS file: /cvs/ports/x11/kde4/p5-kde/Makefile,v
Re: [new port] www/p5-HTTP-CookieJar
On Sun, Nov 04, 2018 at 11:31:02AM +, wen heping wrote: > Hi, ports@: > >Here is a tar file for new port www/p5-HTTP-CookieJar, which is required by > the future update of www/p5-Dancer. > >It both build and test well on my amd64 system. > > Comments? OK? It's Apache 2.0 licensed[1] not like Perl and the COMMENT shouldn't start with an uppercase letter[2], but other than that it's OK afresh1@ I can import with those changes and another OK or if someone else wants. [1] https://metacpan.org/source/DAGOLDEN/HTTP-CookieJar-0.008/LICENSE [2] see item 16 on https://www.openbsd.org/faq/ports/guide.html#PortsChecklist l8rZ, -- andrew - http://afresh1.com Speed matters. Almost as much as some things, and nowhere near as much as others. -- Nick Holland
Re: [UPDATE] devel/p5-POE 1.294 -> 1.367 (p5-POE* update 1/14)
I should have time to commit all these if I could get someone to look at the two new ports and give a second OK before import. On Sat, Nov 17, 2018 at 11:04:49PM +0100, Charlene Wendling wrote: > Hi ports, > > Can somebody look at these 2 please? > > - p5-POE-Component-Resolver > https://marc.info/?l=openbsd-ports=154092768107481=2 > > - p5-POE-Component-Syndicator > https://marc.info/?l=openbsd-ports=154101419130335=2 > > Thanks in advance! > > Charlène. > > > On Sun, 11 Nov 2018 16:55:48 -0700 > Andrew Hewus Fresh wrote: > > > I'll commit all of these with a second OK on importing > > p5-POE-Component-Resolver and p5-POE-Component-Syndicator > > > > On Tue, Oct 30, 2018 at 08:26:09PM +0100, Charlene Wendling wrote: > > > Hi ports, > > > > > > - > > > Intro: > > > > > > This is the second round of the big POE update. I'll submit them in > > > dependency order. > > > > > > The whole thing builds and installs with dpb on amd64 and i386, and > > > the few consumers i've found run fine. > > > - > > > > > > I'm proposing here an update for p5-POE itself. > > > > OK afresh1@ > > reverse dependency tests seem to be the same as with the old version. > > > > > > On Tue, Oct 30, 2018 at 08:26:59PM +0100, Charlene Wendling wrote: > > > > > > I'm proposing here POE::Component::Resolver. It will be needed for > > > updating net/p5-POE-Component-Client-HTTP. > > > > OK afresh1@ > > Looks fine to me, tests pass. > > > > > > > > On Tue, Oct 30, 2018 at 08:27:37PM +0100, Charlene Wendling wrote: > > > > > > I'm proposing here an update for POE::API::Peek, a module that peeks > > > into the internals of a running POE environment. > > > > OK afresh1@ > > The one reverse dependency seems to work with both. > > > > > > > > On Tue, Oct 30, 2018 at 08:28:36PM +0100, Charlene Wendling wrote: > > > > > > Here is an update for POE::Component::IKC, that allow inter kernels > > > communication between POE kernels. > > > > OK afresh1@ > > It doesn't seem that anything in particular depends on this, and the > > update looks good. > > > > > > On Wed, Oct 31, 2018 at 02:07:23PM +0100, Charlene Wendling wrote: > > > Hi ports! > > > > > > Here is a new port for POE::Component::Syndicator. It will be needed > > > for updating net/p5-POE-Component-IRC. > > > > OK afresh1@ > > Looks good to me. > > > > > > On Wed, Oct 31, 2018 at 02:07:42PM +0100, Charlene Wendling wrote: > > > > > > Here is an update for POE::Loop::Event. > > > > OK afresh1@ > > It doesn't seem that anything in particular depends on this, and the > > update looks good. > > > > > > On Wed, Oct 31, 2018 at 02:08:10PM +0100, Charlene Wendling wrote: > > > > > > Here is an update for POE::Loop::Tk, a bridge that allows POE to be > > > driven by Tk. > > > > OK afresh1@ > > It doesn't seem that anything in particular depends on this, and the > > update looks good. Tests didn't actually run as I have apparently > > broken X forwarding from my laptop to my ports testing machine. > > > > > > On Wed, Oct 31, 2018 at 02:08:34PM +0100, Charlene Wendling wrote: > > > > > > Here is an update for POE::Component::Client::DNS, a DNS module for > > > POE. > > > > OK afresh1@ > > reverse dependency tests seem to be the same as with the old version. > > > > > -- andrew - http://afresh1.com Software doesn't do what you want it to do, it does what you tell it do. -- Stefan G. Weichinger.
Remove dolphin from x11/kde4/baseapps?
Hi All!
Coexistence between KDE4 and KDE4 is okay is good but only if it doesn't
harm bulk people. My INBOX is full for x11/kde-applications/dolphin*
build failures, so let's quit with KDE4 dolphin forever.
OK to remove dolphin from KDE4 and remove the conflict tags in
x11/kde-applications/dolphin*?
I hope this should help for the bulk, shouldn't it?
Rafael Sadowski
Index: Makefile
===
RCS file: /cvs/ports/x11/kde4/baseapps/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile16 Nov 2018 06:26:12 - 1.17
+++ Makefile23 Nov 2018 19:31:00 -
@@ -2,29 +2,21 @@
COMMENT = KDE base applications
DISTNAME = kde-baseapps-${MODKDE4_VERSION}
-REVISION = 6
+REVISION = 7
SHARED_LIBS = konq51.0# 6.0
SHARED_LIBS += konqsidebarplugin 51.0# 4.0
-SHARED_LIBS += dolphinprivate 51.0# 1.0
SHARED_LIBS += konquerorprivate51.0# 4.0
SHARED_LIBS += kbookmarkmodel_private 51.0# 4.7
-WANTLIB = c m pthread z
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += ICE SM X11 Xext Xt Xrender
-WANTLIB += lib/qt4/Qt3Support lib/qt4/QtDBus lib/qt4/QtGui
-WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSql lib/qt4/QtSvg
-WANTLIB += lib/qt4/QtXml
-WANTLIB += ${KDE4LIB}/baloocore ${KDE4LIB}/baloofiles ${KDE4LIB}/baloopim
-WANTLIB += ${KDE4LIB}/balooqueryparser ${KDE4LIB}/baloowidgets
-WANTLIB += ${KDE4LIB}/kfilemetadata
+WANTLIB += ${COMPILER_LIBCXX} ICE lib/qt4/Qt3Support lib/qt4/QtDBus
+WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSql
+WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml SM X11 Xext Xt c glib-2.0
WANTLIB += ${KDE4LIB}/kactivities ${KDE4LIB}/kcmutils ${KDE4LIB}/kde3support
-WANTLIB += ${KDE4LIB}/kdesu ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/khtml
-WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/knewstuff3
-WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
-WANTLIB += ${KDE4LIB}/plasma ${KDE4LIB}/solid
-WANTLIB += glib-2.0 soprano tidyp
+WANTLIB += ${KDE4LIB}/kdesu ${KDE4LIB}/kdeui ${KDE4LIB}/kfile
+WANTLIB += ${KDE4LIB}/khtml ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kparts
+WANTLIB += m ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/plasma
+WANTLIB += ${KDE4LIB}/solid soprano tidyp z
MODULES = multimedia/phonon
@@ -36,8 +28,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = devel/glib2 \
www/tidyp \
- ${MODKDE4_DEP_DIR}/baloo>=${MODKDE4_VERSION} \
- ${MODKDE4_DEP_DIR}/baloo-widgets>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/kactivities>=${MIN_ACTIVITIES_VERSION}
+
+TEST_IS_INTERACTIVE = X11
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/kde4/baseapps/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 16 Nov 2018 06:26:12 - 1.9
+++ pkg/PLIST 23 Nov 2018 19:31:00 -
@@ -1,11 +1,7 @@
@comment $OpenBSD: PLIST,v 1.9 2018/11/16 06:26:12 rsadowski Exp $
@conflict kdeaddons-<4
@conflict kdebase-<4
-@conflict kf5-baloo-*
-@conflict dolphin-kf5-*
-@conflict dolphin-plugins-kf5-*
@newgroup _kdesud:583
-@bin bin/dolphin
@bin bin/fsview
@bin bin/kbookmarkmerger
@bin bin/kdepasswd
@@ -16,8 +12,6 @@
@bin bin/konqueror
@bin bin/nspluginscan
@bin bin/nspluginviewer
-bin/servicemenudeinstallation
-bin/servicemenuinstallation
include/kde4/knewmenu.h
include/kde4/konq_dndpopupmenuplugin.h
include/kde4/konq_events.h
@@ -39,13 +33,8 @@ lib/kde4/akregatorkonqfeedicon.so
lib/kde4/autorefresh.so
lib/kde4/babelfishplugin.so
lib/kde4/dirfilterplugin.so
-lib/kde4/dolphinpart.so
lib/kde4/domtreeviewerplugin.so
lib/kde4/fsviewpart.so
-lib/kde4/kcm_dolphingeneral.so
-lib/kde4/kcm_dolphinnavigation.so
-lib/kde4/kcm_dolphinservices.so
-lib/kde4/kcm_dolphinviewmodes.so
lib/kde4/kcm_history.so
lib/kde4/kcm_kio.so
lib/kde4/kcm_konq.so
@@ -58,7 +47,6 @@ lib/kde4/kded_konqy_preloader.so
lib/kde4/khtmlkttsdplugin.so
lib/kde4/khtmlsettingsplugin.so
lib/kde4/kimgallery.so
-lib/kde4/kio_filenamesearch.so
lib/kde4/konq_aboutpage.so
lib/kde4/konq_shellcmdplugin.so
lib/kde4/konq_sidebar.so
@@ -71,7 +59,6 @@ lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
lib/kde4/libnsplugin.so
-@lib ${KDE4LIB}/libdolphinprivate.so.${LIBdolphinprivate_VERSION}
@lib
${KDE4LIB}/libkbookmarkmodel_private.so.${LIBkbookmarkmodel_private_VERSION}
@lib ${KDE4LIB}/libkonq.so.${LIBkonq_VERSION}
@lib ${KDE4LIB}/libkonqsidebarplugin.so.${LIBkonqsidebarplugin_VERSION}
@@ -84,9 +71,7 @@ lib/kde4/uachangerplugin.so
lib/kde4/validatorsplugin.so
lib/kde4/webarchiverplugin.so
lib/kde4/webarchivethumbnail.so
-@lib lib/libdolphinprivate.so.${LIBdolphinprivate_VERSION}
@lib lib/libkbookmarkmodel_private.so.${LIBkbookmarkmodel_private_VERSION}
-lib/libkdeinit4_dolphin.so
math/pari: remove unless updated
The math/pari port remains at version 2.1.7 from 2005 (!). In the meantime, upstream has released a stream of new versions up to 2.11.0 earlier this year. If there is so little interest in maintaining the port, we might as well delete it. (2.1.7 fails to build with lld on i386 and there is no point in spending any effort on a historic version.) -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2018/11/23 12:03:29 Modified files: devel/p5-Exception-Class: Makefile distinfo Log message: Update devel/p5-Exception-Class to 1.44 from wen heping
Re: Patch to enable XFT on lemonbar
Brian Callahan wrote: > Joel Carnat wrote: > > On a journey to find a statusbar for cwm, I found that x11/lemonbar > > didn't support XFT. I used sources from https://github.com/krypt-n/bar > > to compile on OpenBSD 6.4/amd64 and it seems to work. So far, it > > compiles, lemonbar starts and renders text using xft:Sans:size=11. Thanks for investigating and preparing a patch! > This would additionally need a REVISION bump in the port Makefile. > But this seems rather large and invasive. I agree that this patch is quite invasive. > That's not a "no" in and of itself, but would it make more sense to > send this upstream Since there is a issue (https://github.com/LemonBoy/bar/issues/188) from Aug 5, 2016 with no progress I do not think that this has good chances. But who knows ... > or perhaps switch to that forked repo with this already included? I think that is the way to go. The few commits in LemonBoy/bar in the last two years are mainly of cosmetic nature (see GitHub history), so the forked repo has the original and new functionality. @Joel: would you like to prepare a diff for switching? You could also take maintainer at this occasion if you are willing to take care of this port. Best regards, Ingo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2018/11/23 12:01:48 Modified files: devel/p5-Devel-StackTrace: Makefile distinfo Log message: Update devel/p5-Devel-StackTrace to 2.03 from wen heping
UPDATE: x11/kde-applications/gwenview
Information for inst:gwenview-18.08.2 Comment: KDE image viewer Description: Gwenview is a simple image viewer for KDE which offers a folder tree window and a file list window for navigating easily through your image file hierarchy. Features: - correct rendering of alpha-channel in images - docked windows for a configurable layout - full screen mode - a thumbnail view - background thumbnail generation - center images in view - zooming (including fit-to-window) - support for IO slaves - multi-selection support - bookmarks - image rotation and mirroring - advanced keyboard navigation, Opera-like next / previous mouse navigation and customizable mouse-wheel navigation Maintainer: KDE porting team OK to imprt and replace KDE4 gwenview? Rafael gwenview-18.08.2.tar.gz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/11/23 10:16:27 Modified files: devel : Makefile Log message: +py-chai
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/11/23 10:15:53 Log message: import devel/py-chai, from Edward Lopez-Acosta ok jca@, with slight PLIST fixing on top of what was OK'd Chai provides a very easy to use API for mocking, stubbing, and spying your Python objects. This module is modelled after the ruby library Mocha. Status: Vendor Tag: sthen Release Tags: sthen_20181123 N ports/devel/py-chai/Makefile N ports/devel/py-chai/distinfo N ports/devel/py-chai/pkg/DESCR N ports/devel/py-chai/pkg/PLIST N ports/devel/py-chai/pkg/PFRAG.no-python3 No conflicts created by this import
Re: CVS: cvs.openbsd.org: ports
On Thu, Nov 22, 2018 at 11:57:52AM -0700, Frederic Cambus wrote: > CVSROOT: /cvs > Module name: ports > Changes by: fcam...@cvs.openbsd.org 2018/11/22 11:57:52 > > Added files: > audio/ocp/patches: patch-configure > > Log message: > Patch configure to add support for newer versions of GCC. This will > allow building on architectures using ports-gcc to build the port once > we update lang/gcc. > > OK naddy@ ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ ===> Generating configure for ocp-0.1.21p4 ===> Configuring for ocp-0.1.21p4 Using /exopi-obj/pobj/ocp-0.1.21/config.site (generated) configure: WARNING: unrecognized options: --disable-silent-rules, --disable-gtk-doc configure: loading site script /exopi-obj/pobj/ocp-0.1.21/config.site checking build system type... x86_64-unknown-openbsd6.4 checking host system type... x86_64-unknown-openbsd6.4 checking for gcc... cc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... (cached) o checking whether we are using the GNU C compiler... (cached) yes checking whether cc accepts -g... (cached) yes checking for cc option to accept ISO C89... none needed checking whether we are using the GNU C++ compiler... (cached) yes checking whether c++ accepts -g... (cached) yes checking how to run the C preprocessor... cc -E checking how to run the C++ preprocessor... c++ -E checking whether gmake sets $(MAKE)... yes checking for grep that handles long lines and -e... (cached) /usr/bin/grep checking for egrep... (cached) /usr/bin/egrep checking for ANSI C header files... (cached) yes checking for sys/types.h... (cached) yes checking for sys/stat.h... (cached) yes checking for stdlib.h... (cached) yes checking for string.h... (cached) yes checking for memory.h... (cached) yes checking for strings.h... (cached) yes checking for inttypes.h... (cached) yes checking for stdint.h... (cached) yes checking for unistd.h... (cached) yes checking whether byte ordering is bigendian... no checking gcc version... ./configure[4593]: syntax error: `)' unexpected *** Error 1 in audio/ocp (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2756 'do-configure') *** Error 1 in audio/ocp (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2776 '/exopi-obj/pobj/ocp-0.1.21/.configure_done') *** Error 1 in audio/ocp (/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2463 'build') -- Antoine
UPDATE: x11/kde-applications/kbruch
Information for inst:kbruch-18.08.2 Comment: KDE calculating fractions practicing app Description: KBruch is a small program to practice calculating with fractions for KDE. Maintainer: KDE porting team WWW: https://edu.kde.org/kbruch/ OK to im port and replace KDE4 kbruch? Rafael kbruch-18.08.2.tar.gz Description: Binary data
Re: NEW: x11/kde-applications/kanagram
On Fri Nov 23, 2018 at 03:34:14PM +0100, Rafael Sadowski wrote: > > Information for inst:kanagram-18.08.2 > > Comment: > letter order game > > Description: > Kanagram is a game that is based on the word/letter puzzles that the > author played as a child. A word is picked at random and displayed with > its letters in a messed order, with difficulty dependent on the chosen > level. You have an unlimited number of attempts, and scores are kept. > > Maintainer: KDE porting team > > WWW: https://edu.kde.org/kanagram/ > > > OK to import and to replace KDE4 kanagram. > > Rafael New tarball with lost run depends attached kanagram-18.08.2p0.tar.gz Description: Binary data
Re: update mpv to 0.29.1
On Sun, Nov 18, 2018 at 12:40:54AM +0100, Klemens Nanni wrote:
> Depending on the ffmpeg update, here's mpv.
>
> Works just fine on amd64 with various formats and codecs where
> performance improvements are quite noticable.
>
> According to `port-lib-depends-check' the cd, dvd and v4l related
> libraries where extra, so I blatantly removed them including their LDEP.
>
> Since I don't have access to CD/DVD (readers), can anyone test mpv
> with playing physical media?
>
> Otherwise it's a simple version bump, switch to HTTPS, removal of
> obsolete CONFIGURE_ARGS and simplifications for do-* targets.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/multimedia/mpv/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- Makefile 13 Nov 2018 17:12:51 - 1.43
> +++ Makefile 17 Nov 2018 23:35:01 -
> @@ -4,17 +4,16 @@ COMMENT = movie player based on MPlayer
>
> GH_ACCOUNT = mpv-player
> GH_PROJECT = mpv
> -GH_TAGNAME = v0.22.0
> -REVISION = 4
> +GH_TAGNAME = v0.29.1
>
> CATEGORIES = multimedia x11
>
> -HOMEPAGE = http://mpv.io/
> +HOMEPAGE = https://mpv.io/
>
> MAINTAINER = Dmitrij D. Czarkoff
>
> -WAF =${WRKSRC}/waf-1.8.19
> -MASTER_SITES0 = http://waf.io/
> +WAF =${WRKSRC}/waf-2.0.12
> +MASTER_SITES0 = https://waf.io/
> DISTFILES = ${DISTNAME}{${GH_TAGNAME}}${EXTRACT_SUFX} ${WAF:T}:0
> EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
>
> @@ -22,14 +21,11 @@ EXTRACT_ONLY =${DISTNAME}${EXTRACT_SUF
> PERMIT_PACKAGE_CDROM = patents
> PERMIT_PACKAGE_FTP = Yes
>
> -WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
> -WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec
> -WANTLIB += avdevice avfilter avformat avresample avutil bluray
> -WANTLIB += c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread expat
> -WANTLIB += fontconfig freetype fribidi gbm iconv jpeg lcms2 m
> -WANTLIB += opus postproc pthread sndio speex swresample
> -WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
> -WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
> +WANTLIB += ${MODLUA_WANTLIB} EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext
> +WANTLIB += Xfixes Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec avdevice
> +WANTLIB += avfilter avformat avutil bluray c drm expat fontconfig freetype
> +WANTLIB += fribidi gbm iconv jpeg lcms2 m postproc pthread sndio swresample
> +WANTLIB += swscale xcb xcb-dri2 xcb-glx z
>
> MODULES =lang/lua \
> lang/python
> @@ -37,17 +33,13 @@ MODULES = lang/lua \
> BUILD_DEPENDS = audio/ladspa \
> textproc/py-docutils
>
> -LIB_DEPENDS =audio/libcdio \
> - converters/libiconv \
> - devel/libdvdread \
> +LIB_DEPENDS =converters/libiconv \
> devel/sdl2 \
> graphics/ffmpeg>=20151112 \
> graphics/jpeg \
> graphics/lcms2 \
> multimedia/libass \
> - multimedia/libbluray>=0.8.0 \
> - multimedia/libdvdnav \
> - multimedia/libv4l
> + multimedia/libbluray>=0.8.0
>
> MODPY_RUNDEP = No
> RUN_DEPENDS =devel/desktop-file-utils \
> @@ -58,16 +50,13 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
> --mandir=${LOCALBASE}/man \
> --docdir=${LOCALBASE}/share/examples/mpv \
> --zshdir=${LOCALBASE}/share/zsh/vendor-completions \
> - --enable-encoding \
> --enable-sndio \
> --enable-sdl2 \
> --enable-zsh-comp \
> --disable-alsa \
> --disable-caca \
> - --disable-enca \
> --disable-jack \
> --disable-libarchive \
> - --disable-libguess \
> --disable-rubberband \
> --disable-oss-audio \
> --disable-openal \
> @@ -78,15 +67,12 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
> --disable-uchardet \
> --disable-vaapi \
> --disable-vaapi-glx \
> - --disable-vaapi-hwaccel \
> --disable-vaapi-x-egl \
> --disable-vaapi-x11 \
> --disable-vaapi-wayland \
> --disable-vapoursynth \
> --disable-vapoursynth-lazy \
> --disable-vdpau \
> - --disable-vdpau-hwaccel \
> -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/11/23 09:02:35 Modified files: games/eduke32 : Makefile Log message: tweak
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2018/11/23 09:00:16 Modified files: textproc/the_silver_searcher: Makefile distinfo Log message: Update to the_silver_search-2.2.0 -- predominantly recognizing more languages. Original diff from Edward Lopez-Acosta, with tweaks from me to switch the HOMEPAGE and MASTER_SITES to their correct locations and https. ok sthen@, works fine for MAINTAINER
Re: Patch to enable XFT on lemonbar
Hi Joel -- On 11/22/18 6:53 PM, Joel Carnat wrote: Hi, On a journey to find a statusbar for cwm, I found that x11/lemonbar didn't support XFT. I used sources from https://github.com/krypt-n/bar to compile on OpenBSD 6.4/amd64 and it seems to work. So far, it compiles, lemonbar starts and renders text using xft:Sans:size=11. Find the relevant patches attached. Regards, Jo This would additionally need a REVISION bump in the port Makefile. But this seems rather large and invasive. That's not a "no" in and of itself, but would it make more sense to send this upstream, or perhaps switch to that forked repo with this already included? ~Brian
Re: UPDATE: security/sshguard, 1.5-->2.1.0 (2nd try)
On 2018/11/22 21:05, Andreas Kusalananda Kähäri wrote: > On Thu, Nov 22, 2018 at 02:39:54PM +, Stuart Henderson wrote: > > > On Sun, 22 Apr 2018 at 16:03:23 +0200, Andreas Kusalananda Kähäri wrote: > > > > I posted about this update in late March when I had issues getting the > > > > sshguard service to properly shut down, but that issue has since been > > > > resolved (rc_stop() needs to send it the HUP signal). > > > > HUP to shutdown?! is there some analysis on this, that's really weird. > > Looking at > > https://bitbucket.org/sshguard/sshguard/src/ff8b525254a6c6e01e0f484cc3feba93e28a326e/src/sshguard.in?at=master=file-view-default > > > The main sshguard utility is a shell script that starts a log "tail" > reader, a log parser, a "blocker" (which I presume decides whether a > behaviour warrants blocking or not) and a firewall-specific backend that > actually does the blocking. These are started in a shell pipeline: > > eval $tailcmd | $libexec/sshg-parser | \ > $libexec/sshg-blocker $flags | ($BACKEND; kill -PIPE $$) > > (the unquoted variable expansions..., I won't comment more on them) > > The bulk of the main shell script is just setting up the values of the > variables used in this pipeline. > > At the start of the script, there's > > trap "trap - TERM && kill 0" INT TERM EXIT > > ... which does my head in a bit. It's *really* easy to start sshguard > and have one of the components of this pipeline not work correctly (it's > usually one and the same, but I forget which one now). This usually > happens when it's started from pkg_scripts at boot (but not when started > manually later for some reason). Sending the main script a HUP was > about the *only* way I could reliably get all components of the pipeline > to exit cleanly. > > I'm assuming that it expects /bin/sh to be bash, and this could be one > of the reasons why it misbehaves under our /bin/sh (I haven't tested > with bash). > > I have only ever looked at the shell script portion of sshguard 2.1.0 > and the BitBucket Git thing I linked to and quoted above may well be > newer than that. I gave up when I couldn't get it to start/shut down > reliably. > > When it *ran*, it worked flawlessly. > > I've been meaning to get back to this to sort it out for OpenBSD, but > have forgotten and have had other things getting in the way. Thanks - no objection to the update then, but would appreciate a link to the list archive for this (https://marc.info/?l=openbsd-ports=154291717732337=2) in commit log for the benefit of people looking later :)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/11/23 08:31:22 Modified files: editors/emacs : Makefile Log message: Don't clobber LDFLAGS
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/11/23 08:22:51 Modified files: www/nghttp2: Makefile distinfo Log message: update to nghttp2-1.35.0
NEW: x11/kde-applications/kanagram
Information for inst:kanagram-18.08.2 Comment: letter order game Description: Kanagram is a game that is based on the word/letter puzzles that the author played as a child. A word is picked at random and displayed with its letters in a messed order, with difficulty dependent on the chosen level. You have an unlimited number of attempts, and scores are kept. Maintainer: KDE porting team WWW: https://edu.kde.org/kanagram/ OK to import and to replace KDE4 kanagram. Rafael kanagram-18.08.2.tar.gz Description: Binary data
NEW: x11/kde-applications/libkeduvocdocument
Information for inst:libkeduvocdocument-18.08.2 Comment: library for reading and writing vocabulary Description: KEduVocDocument is a library for reading and writing vocabulary files used by Parley, Kanagram, KHangMan and KWordQuiz.At this date no binary compatibility is guaranteed. Please update this lib when updating the applications mentioned above. Maintainer: KDE porting team OK to import? No conflicts with other ports; KDE5 only. Rafael libkeduvocdocument-18.08.2.tar.gz Description: Binary data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2018/11/23 07:15:03 Modified files: games/ezquake : Makefile Log message: Bump revision for last commit
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2018/11/23 07:08:23 Added files: games/ezquake/patches: patch-EX_browser_sources_c Log message: Add missing patch from last commit to tell ezquake where to look at server list. Spotted by jca@
NEW: x11/kde-applications/kalzium
Information for inst:kalzium-18.08.2 Comment: periodic table of elements Description: Kalzium is your digital replacement for the periodic table on paper. It is a program that visualizes the Periodic Table of Elements (PSE) and includes basic information about all common elements in the PSE. It has a gained much more functions over time. Features - versatile overview of all important data from the elements like melting points, electron affinity, electronegativity, electron configuration, radii, mass, ionisation energy - tool to visualize the spectral lines of each element - different colored views of the PSE: separation of the different blocks, Year simulator, Temperature simulator - Molecular weight calculator - an Isotope table - 3D molecule editor, with a load and save functionality - an equation solver for stoichiometric problems - filetype conversion for different types of chemical programs - tool to produce a comprehensive list of all Risk_and_Safety_Statements Maintainer: KDE porting team WWW: https://edu.kde.org/kalzium/ OK to import? KDE4 Kalzium was never ported to OpenBSD, so we see only the standard conflicts with l10n. Rafael kalzium-18.08.2.tar.gz Description: Binary data
Re: [NEW] games/mvdsv 0.32
On Fri, Nov 23 2018, Jeremie Courreges-Anglas wrote:
> On Fri, Oct 19 2018, Solene Rapenne wrote:
>> Tom Murphy wrote:
>>> On Thu, Oct 04, 2018 at 12:11:01PM +0200, Solene Rapenne wrote:
>>> > Small introduction for people reading ports@.
>>> >
>>> > mvdsv is a quake world game server. It has some features like allowing to
>>> > record games from every player point of view. That can be played again in
>>> > a
>>> > quake client like ezquake.
>>> >
>>> > ok solene@
>>>
>>> Thanks Solene and Stuart for their help! Attached is a new tarball using
>>> GH_TAGNAME and the correct DISTFILES settings.
>>>
>>> -Tom
>>
>> up
>>
>> looks fine to me
>
> The build system is not very portable. The configure script hardcodes
> a bunch of arch-dependent logic which breaks on eg. sparc64:
>
> ../../src/pr_exec.c:1: error: -m32 is not supported by this configuration
>
> Also, Makefile.BSD contains:
>
> --8<--
> . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
> USE_ASM=-Did386
> DO_CFLAGS += ${USE_ASM}
> . endif
> -->8--
>
> It would be good to check that the port builds on i386 with assembly
> enabled. Or you could wait for bulk build reports. ;)
>
> Using devel/meson could be a nicer alternative to Makefile.BSD, which
> looks a bit outdated (no curl support for example).
Using meson is cleaner since meson.build doesn't hardcode so much crap.
Also it autodetects system pcre instead of falling back to an ancient
bundled version. Updated tarball.
mvdsv.4.tgz
Description: Binary data
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: textprox/the_silver_searcher-2.2.0
On 18/11/2018 22:09, Edward Lopez-Acosta wrote: Minor version bump. Existing version is >1 year old. Builds and runs fine on amd64. No changelog listed on GitHub page, and no tests. Ok? Seems to work fine for me. Been using that patch for a few days now without problems. Florian
Re: Would firefox be updated in ports for 6.3 release?
On Fri, Nov 23, 2018 at 01:57:28PM +0100, Antoine Jacoutot wrote: > On Fri, Nov 23, 2018 at 01:47:24PM +0100, Landry Breuil wrote: > > On Fri, Nov 23, 2018 at 04:37:10PM +0500, Артур Истомин wrote: > > > Good day! > > > > > > Firefox ESR version in ports 60.2.2, but latest version ESR is 60.3 > > > released on october > > > 23, where has been fixed at least 2 critical and 3 high security > > > vulnerabilities > > > (see https://www.mozilla.org/en-US/security/advisories/mfsa2018-27/) > > > > > > To update firefox to latest non-vuln version should i update OpenBSD and > > > ports to > > > 6.4? > > > > https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/firefox-esr/distinfo?only_with_tag=OPENBSD_6_4 > > That is 6.4 :-) Yes, and the policy in https://www.openbsd.org/faq/ports/ports.html#PortsSecurity states that's "the -stable ports tree only gets security backports for the latest release." - thus 6.3 is EOL portswise. Landry
Re: Would firefox be updated in ports for 6.3 release?
On Fri, Nov 23, 2018 at 01:47:24PM +0100, Landry Breuil wrote: > On Fri, Nov 23, 2018 at 04:37:10PM +0500, Артур Истомин wrote: > > Good day! > > > > Firefox ESR version in ports 60.2.2, but latest version ESR is 60.3 > > released on october > > 23, where has been fixed at least 2 critical and 3 high security > > vulnerabilities > > (see https://www.mozilla.org/en-US/security/advisories/mfsa2018-27/) > > > > To update firefox to latest non-vuln version should i update OpenBSD and > > ports to > > 6.4? > > https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/firefox-esr/distinfo?only_with_tag=OPENBSD_6_4 That is 6.4 :-) -- Antoine
Re: update: devel/subversion 1.11.0
On Wed, Nov 21, 2018 at 12:18:16PM +0100, Aham Brahmasmi wrote: > Hello ports, > > Apologies for removing the context, I joined the ports list recently and > do not have stsp's original mail. > > I may be wrong here, but I was wondering whether we could change the > home of the _svnserve user to /var/svn from the current /nonexistent. > > In other words, could we change from > @newuser _svnserve:777:_svnserve:daemon:SVN Daemon:/nonexistent:/sbin/nologin > to > @newuser _svnserve:777:_svnserve:daemon:SVN Daemon:/var/svn:/sbin/nologin > > The idea is that post installation, one has to change the owner of the > /var/svn/reponame directory to _svnserve anyways. I like your idea. I suppose /var/svn is a sane default path, and there are already other cases where other parts create directories in /var. I'll note though that /var/svn won't work with an Apache HTTPD server chrooted to /var/www -- but chroot requires special steps anyway and having /var/svn around for just svnserve won't hurt. Would you be able to submit a diff to the port which implements this idea? > Steps: > $ doas pkg_add subversion > $ cd /var > $ doas mkdir svn > $ cd /var/svn > $ doas svnadmin create reponame > $ doas chown -R _svnserve:_svnserve /var/svn/reponame > $ doas mkdir log > $ doas chown -R _svnserve:_svnserve /var/svn/log > > For more context, could I please refer you to my recent mail on misc - > https://marc.info/?l=openbsd-misc=154221094309572=2. > > In case I am missing something or doing something stupid, please feel > free to point it out. > > Thanks. > > Regards, > ab > -|-|-|-|-|-|-|-- >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/11/23 05:49:29 Modified files: x11/kde-applications/marble: Makefile Log message: change comment to "virtual globe and world atlas", add homepage Missing homepage spotted by Stefan Wollny
Re: Would firefox be updated in ports for 6.3 release?
On Fri, Nov 23, 2018 at 04:37:10PM +0500, Артур Истомин wrote: > Good day! > > Firefox ESR version in ports 60.2.2, but latest version ESR is 60.3 released > on october > 23, where has been fixed at least 2 critical and 3 high security > vulnerabilities > (see https://www.mozilla.org/en-US/security/advisories/mfsa2018-27/) > > To update firefox to latest non-vuln version should i update OpenBSD and > ports to > 6.4? https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/firefox-esr/distinfo?only_with_tag=OPENBSD_6_4
Re: update: devel/subversion 1.11.0
On Wed, Nov 21, 2018 at 04:00:04PM +0100, Stefan Sperling wrote: > On Tue, Nov 20, 2018 at 11:15:59PM -0500, George Koehler wrote: > > Looks like GitHub's svn bridge is still broken: > > > > $ svn co --depth empty https://github.com/OpenTTD/OpenTTD > > svn: E170013: Unable to connect to a repository at URL > > 'https://github.com/OpenT > > TD/OpenTTD' > > svn: E175003: The server at 'https://github.com/OpenTTD/OpenTTD' does not > > suppor > > t the HTTP/DAV protocol > > > > They're working on it: https://svn.haxx.se/users/archive-2018-11/0067.shtml This update has now been committed. If anyone still has problems with GitHub's SVN bridge, please take your problem to GitHub, not me. Thanks.
Would firefox be updated in ports for 6.3 release?
Good day! Firefox ESR version in ports 60.2.2, but latest version ESR is 60.3 released on october 23, where has been fixed at least 2 critical and 3 high security vulnerabilities (see https://www.mozilla.org/en-US/security/advisories/mfsa2018-27/) To update firefox to latest non-vuln version should i update OpenBSD and ports to 6.4? Thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2018/11/23 05:41:47 Modified files: devel/subversion: Makefile distinfo devel/subversion/pkg: PLIST-gnome-keyring PLIST-main PLIST-perl PLIST-python PLIST-ruby Log message: Update to Apache Subversion 1.11.0 ok sthen@
Re: [NEW] games/mvdsv 0.32
On Fri, Oct 19 2018, Solene Rapenne wrote:
> Tom Murphy wrote:
>> On Thu, Oct 04, 2018 at 12:11:01PM +0200, Solene Rapenne wrote:
>> > Small introduction for people reading ports@.
>> >
>> > mvdsv is a quake world game server. It has some features like allowing to
>> > record games from every player point of view. That can be played again in a
>> > quake client like ezquake.
>> >
>> > ok solene@
>>
>> Thanks Solene and Stuart for their help! Attached is a new tarball using
>> GH_TAGNAME and the correct DISTFILES settings.
>>
>> -Tom
>
> up
>
> looks fine to me
The build system is not very portable. The configure script hardcodes
a bunch of arch-dependent logic which breaks on eg. sparc64:
../../src/pr_exec.c:1: error: -m32 is not supported by this configuration
Also, Makefile.BSD contains:
--8<--
. if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
USE_ASM=-Did386
DO_CFLAGS += ${USE_ASM}
. endif
-->8--
It would be good to check that the port builds on i386 with assembly
enabled. Or you could wait for bulk build reports. ;)
Using devel/meson could be a nicer alternative to Makefile.BSD, which
looks a bit outdated (no curl support for example). Else, we could pass
arguments to the CONFIGURE_SCRIPT to fix its behavior.
Another concern: I think this has already been pointed out by fcambus@,
qwprogs.dat should have a versioned file name, should it be updated some
day.
Here's an updated tarball, Makefile diff below to ease review. With
those changes, ok jca@ to import
mvdsv.2.tgz
Description: Binary data
--- Makefile.orig Thu Oct 4 22:03:40 2018
+++ MakefileFri Nov 23 13:14:26 2018
@@ -13,6 +13,7 @@ HOMEPAGE =https://sourceforge.net/projects/mvdsv/
MAINTAINER = Tom Murphy
QWP_COMMIT = 0023db327bc1db00068284b70e1db45857aeee35
+QWP_VERSION = 20120131
MASTER_SITES0 =
https://raw.githubusercontent.com/id-Software/Quake/${QWP_COMMIT}/QW/progs/
# GPLv2+
@@ -21,15 +22,24 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c curl m pthread
DISTFILES =mvdsv-{}${GH_TAGNAME}.tar.gz \
- qwprogs.dat:0
+ qwprogs-${QWP_VERSION}{qwprogs}.dat:0
EXTRACT_ONLY = mvdsv-${GH_TAGNAME}.tar.gz
LIB_DEPENDS = net/curl
+.include
+.if ${PROPERTIES:Mlp64}
+BITS = 64
+.else
+BITS = 32
+.endif
+
CONFIGURE_STYLE = simple
+CONFIGURE_ARGS = OpenBSD ${BITS}
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lcurl -lm"
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lcurl -lm" \
+ FORCE32BITFLAGS=""
NO_TEST = Yes
@@ -41,6 +51,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mvdsv ${PREFIX}/bin
${INSTALL_DATA_DIR} ${SAMPLES_DIR}
${INSTALL_DATA} ${FILESDIR}/server.cfg ${SAMPLES_DIR}
- ${INSTALL_DATA} ${DISTDIR}/qwprogs.dat ${SAMPLES_DIR}
+ ${INSTALL_DATA} ${DISTDIR}/qwprogs-${QWP_VERSION}.dat \
+ ${SAMPLES_DIR}/qwprogs.dat
.include
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sol...@cvs.openbsd.org 2018/11/23 04:41:43 Modified files: games/ezquake : Makefile games/ezquake/pkg: PLIST Log message: Add servers list for multiplayer mode ok jca@ awolk@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 03:23:43 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.16.60.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 03:23:27 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py-botocore-1.12.50.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 03:23:08 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py-boto3-1.9.50.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 03:20:22 Modified files: sysutils/amazon-ecs-cli: Makefile distinfo Log message: Update to ecs-cli-1.12.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 03:20:40 Modified files: sysutils/amazon-ssm-agent: Makefile distinfo Log message: Update to amazon-ssm-agent-2.3.274.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 03:14:17 Modified files: sysutils/terraform/provider-alicloud: Makefile distinfo sysutils/terraform/provider-aws: Makefile distinfo sysutils/terraform/provider-vault: Makefile distinfo Log message: Update terraform providers.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 02:51:41 Modified files: sysutils/consul: Makefile distinfo Log message: Update to consul-1.4.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 02:49:41 Modified files: security/vault : Makefile distinfo Log message: Update to vault-0.11.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/11/23 02:49:05 Modified files: sysutils/packer: Makefile distinfo Log message: Update to packer-1.3.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/11/23 02:23:14 Modified files: lang/gprolog : Makefile Log message: Accept text relocations on i386, needed by ld.lld Reported and fix suggested by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/11/23 02:17:37 Modified files: lang/gprolog : Makefile Added files: lang/gprolog/patches: patch-EnginePl_try_sigaction_c Log message: Add support for sparc64 I tried to relax the checks in try_sigaction.c so that it works on any arch, but maybe that test should be dropped completely instead. The runtime doesn't need a precise fault address, the latter is only used for reporting.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/11/23 02:13:40 Modified files: lang/gprolog : Makefile Removed files: lang/gprolog/patches: patch-configure_in Log message: Disabling PIE is not needed on i386, amd64 and sparc64 i386 test by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/11/23 02:11:15 Modified files: lang/gprolog : Makefile lang/gprolog/patches: patch-EnginePl_machine_h Removed files: lang/gprolog/patches: patch-EnginePl_dl_malloc_c Log message: Use system malloc(3), not Doug Lea malloc (backed by sbrk(2) by default)
Re: Patch to enable XFT on lemonbar
On Fri, Nov 23 2018, Joel Carnat wrote:
> Hi,
Hi,
> On a journey to find a statusbar for cwm, I found that x11/lemonbar
> didn't support XFT. I used sources from https://github.com/krypt-n/bar
> to compile on OpenBSD 6.4/amd64 and it seems to work. So far, it
> compiles, lemonbar starts and renders text using xft:Sans:size=11.
>
> Find the relevant patches attached.
Make sure you at least Cc the port maintainer. You should probably have
discussed this diff with Ingo first, it looks a bit intrusive.
> Regards,
> Jo
>
> --- Makefile.orig Fri Nov 23 00:26:08 2018
> +++ Makefile Fri Nov 23 00:35:00 2018
> @@ -1,4 +1,4 @@
> # This snippet has been shmelessly stol^Hborrowed from thestinger's repose
> Makefile
> -VERSION = 1.2
> +VERSION = 1.3
> GIT_DESC=$(shell test -d .git && git describe --always 2>/dev/null)
>
> @@ -8,6 +8,8 @@
>
> CC ?= gcc
> -CFLAGS += -Wall -std=c99 -DVERSION="\"$(VERSION)\""
> -LDFLAGS += -lxcb -lxcb-xinerama -lxcb-randr
> +CFLAGS += -Wall -std=c99 -DVERSION="\"$(VERSION)\"" \
> + -I/usr/X11R6/include/freetype2
> +LDFLAGS += -lxcb -lxcb-xinerama -lxcb-randr \
> + -lX11 -lX11-xcb -lXft -lfreetype -lz
> -lfontconfig
> CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long \
>-Wsign-conversion -Wconversion -Wimplicit-function-declaration
>
> --- lemonbar.c.orig Mon Nov 20 11:47:43 2017
> +++ lemonbar.cFri Nov 23 00:30:26 2018
> @@ -2,4 +2,5 @@
> #define _POSIX_C_SOURCE 200809L
> #include
> +#include
> #include
> #include
> @@ -8,4 +9,5 @@
> #include
> #include
> +#include
> #include
> #include
> @@ -18,6 +20,9 @@
> #include
>
> -// Here be dragons
> +#include
> +#include
>
> +// Here bet dragons
> +
> #define max(a,b) ((a) > (b) ? (a) : (b))
> #define min(a,b) ((a) < (b) ? (a) : (b))
> @@ -26,8 +31,13 @@
> typedef struct font_t {
> xcb_font_t ptr;
> +xcb_charinfo_t *width_lut;
> +
> +XftFont *xft_ft;
> +
> +int ascent;
> +
> int descent, height, width;
> uint16_t char_max;
> uint16_t char_min;
> -xcb_charinfo_t *width_lut;
> } font_t;
>
> @@ -69,9 +79,8 @@
> };
>
> -enum {
> -ALIGN_L = 0,
> -ALIGN_C,
> -ALIGN_R
> -};
> +enum { ALIGN_L = 0,
> + ALIGN_C,
> + ALIGN_R
> + };
>
> enum {
> @@ -84,13 +93,24 @@
> #define MAX_FONT_COUNT 5
>
> +static Display *dpy;
> static xcb_connection_t *c;
> +
> static xcb_screen_t *scr;
> +static int scr_nbr = 0;
> +
> static xcb_gcontext_t gc[GC_MAX];
> static xcb_visualid_t visual;
> +static Visual *visual_ptr;
> static xcb_colormap_t colormap;
> +
> +
> static monitor_t *monhead, *montail;
> static font_t *font_list[MAX_FONT_COUNT];
> static int font_count = 0;
> static int font_index = -1;
> +static int offsets_y[MAX_FONT_COUNT];
> +static int offset_y_count = 0;
> +static int offset_y_index = 0;
> +
> static uint32_t attrs = 0;
> static bool dock = false;
> @@ -102,4 +122,12 @@
> static area_stack_t area_stack;
>
> +static XftColor sel_fg;
> +static XftDraw *xft_draw;
> +
> +//char width lookuptable
> +#define MAX_WIDTHS (1 << 16)
> +static wchar_t xft_char[MAX_WIDTHS];
> +static charxft_width[MAX_WIDTHS];
> +
> void
> update_gc (void)
> @@ -108,4 +136,11 @@
> xcb_change_gc(c, gc[GC_CLEAR], XCB_GC_FOREGROUND, (const uint32_t []){
> bgc.v });
> xcb_change_gc(c, gc[GC_ATTR], XCB_GC_FOREGROUND, (const uint32_t []){
> ugc.v });
> +XftColorFree(dpy, visual_ptr, colormap , _fg);
> +char color[] = "#ff";
> +uint32_t nfgc = fgc.v & 0x00ff;
> +snprintf(color, sizeof(color), "#%06X", nfgc);
> +if (!XftColorAllocName (dpy, visual_ptr, colormap, color, _fg)) {
> +fprintf(stderr, "Couldn't allocate xft font color '%s'\n", color);
> +}
> }
>
> @@ -189,5 +224,35 @@
> }
>
> +
> int
> +xft_char_width_slot (uint16_t ch)
> +{
> +int slot = ch % MAX_WIDTHS;
> +while (xft_char[slot] != 0 && xft_char[slot] != ch)
> +{
> +slot = (slot + 1) % MAX_WIDTHS;
> +}
> +return slot;
> +}
> +
> +int xft_char_width (uint16_t ch, font_t *cur_font)
> +{
> +int slot = xft_char_width_slot(ch);
> +if (!xft_char[slot]) {
> +XGlyphInfo gi;
> +FT_UInt glyph = XftCharIndex (dpy, cur_font->xft_ft, (FcChar32) ch);
> +XftFontLoadGlyphs (dpy, cur_font->xft_ft, FcFalse, , 1);
> +XftGlyphExtents (dpy, cur_font->xft_ft, , 1, );
> +XftFontUnloadGlyphs (dpy, cur_font->xft_ft, , 1);
> +xft_char[slot] = ch;
> +xft_width[slot] = gi.xOff;
> +return gi.xOff;
> +} else if (xft_char[slot] == ch)
> +return xft_width[slot];
> +else
> +return 0;
> +}
> +
> +int
> shift (monitor_t *mon, int x, int align, int ch_width)
> {
> @@ -208,6 +273,6 @@
> break;
> }
> -
> -// Draw the background first
> +
> +/* Draw the background first */
>
