termux / x11-packages

A set of packages using X11 Windows System.
Other
547 stars 145 forks source link

Polybar : Updated to 3.6.1 #692

Closed Dawimpy closed 2 years ago

Dawimpy commented 2 years ago

@xtkoba want to ask why patch will be ignored...

xtkoba commented 2 years ago

Current context of failure:

Applying patch: tmpdir.patch
The text leading up to this was:
--------------------------
|diff -uNr ./polybar/src/ipc.cpp ./polybar.mod/src/ipc.cpp
|--- ./polybar/src/ipc.cpp 2019-04-03 08:32:20.000000000 +0300
|+++ ./polybar.mod/src/ipc.cpp     2019-07-10 22:14:11.763825428 +0300
--------------------------
File to patch:
Skip this patch? [y]
1 out of 1 hunk ignored

This is because our build system invokes patch command with -p1 option. As a result, in the above case patch attempts to find polybar.mod/src/ipc.cpp which does not exist.

A workaround is to remove leading ./ from file names.

Dawimpy commented 2 years ago

I think the patch must be deleted since no such file there...

Dawimpy commented 2 years ago

@xtkoba don't merge it till I found all hardcoded path...

Grimler91 commented 2 years ago

I think the patch must be deleted since no such file there...

The path is passed as a configurarion option now instead: https://github.com/polybar/polybar/blob/master/cmake/02-opts.cmake#L19

Dawimpy commented 2 years ago

I think the patch must be deleted since no such file there...

The path is passed as a compiler option now instead: https://github.com/polybar/polybar/blob/master/cmake/02-opts.cmake#L19

Thanks! I will try to fix them when I have time... Currently busy now

Dawimpy commented 2 years ago

@xtkoba Done

xtkoba commented 2 years ago

I believe this is almost ready to merge. Please squash the commits.

Dawimpy commented 2 years ago
--  Module support:
-- [ ]   alsa

-- [X]   curl (7.82.0)

-- [ ]   i3`

From here we can know i3 module doesn't enable. Can I use -DENABLE_I3=ON at cmake flag in install.sh?

xtkoba commented 2 years ago

If you mean build.sh by install.sh, then try:

TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DENABLE_I3=ON
"

though not sure if working.

Dawimpy commented 2 years ago
Downloading https://www.zlib.net/zlib-1.2.11.tar.xz
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 404 Not Found
Failed to download https://www.zlib.net/zlib-1.2.11.tar.xz

wait!? Does zlib is updated to v1.2.12?

Grimler91 commented 2 years ago

Rebase against master branch and that problem should be solved

Dawimpy commented 2 years ago

ipc.h not founded(probably not update i3 to latest version). Let me rolling back ...

Dawimpy commented 2 years ago

I think devs can merge now

xtkoba commented 2 years ago

Please squash all the commits into one.

Dawimpy commented 2 years ago

How to squash it?

Dawimpy commented 2 years ago

Good , i broke all things...

ghost commented 2 years ago

How to squash it?

@NoNameMan1231 Use git rebase -i and squash specific commits from pick to squash

https://www.git-tower.com/learn/git/faq/git-squash/