Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release] v1.4.1 #1961

Merged
merged 43 commits into from Apr 20, 2021
Merged

[Release] v1.4.1 #1961

merged 43 commits into from Apr 20, 2021

Conversation

ice0
Copy link
Collaborator

@ice0 ice0 commented Dec 30, 2020

============== 2021.04.20 ======================

============== 2021.02.28 ======================

============================================

@morevnaproject
Copy link
Member

I have submitted job to build server to generate test packages...

@morevnaproject
Copy link
Member

@ice0 I have made attempt to build this PR on OSX 10.9 and it failed with the following error:

libtool: compile:  g++ -DHAVE_CONFIG_H -I../.. -I/Users/admin/sources/synfig/synfig-core/src -I/usr/local/opt/gettext/include -I/usr/local/include -I/usr/local/Cellar/glibmm/2.54.1/include/glibmm-2.4 -I/usr/local/Cellar/glibmm/2.54.1/lib/glibmm-2.4/include -I/usr/local/Cellar/glib/2.54.2/include/glib-2.0 -I/usr/local/Cellar/glib/2.54.2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.41/include -I/usr/local/Cellar/libsigc++/2.10.0/include/sigc++-2.0 -I/usr/local/Cellar/libsigc++/2.10.0/lib/sigc++-2.0/include -D_REENTRANT -I/usr/local/Cellar/glibmm/2.54.1/include/giomm-2.4 -I/usr/local/Cellar/glibmm/2.54.1/lib/giomm-2.4/include -I/usr/local/Cellar/glibmm/2.54.1/include/glibmm-2.4 -I/usr/local/Cellar/glibmm/2.54.1/lib/glibmm-2.4/include -I/usr/local/Cellar/glib/2.54.2/include/glib-2.0 -I/usr/local/Cellar/glib/2.54.2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.41/include -I/usr/local/Cellar/libsigc++/2.10.0/include/sigc++-2.0 -I/usr/local/Cellar/libsigc++/2.10.0/lib/sigc++-2.0/include -I/usr/local/Cellar/libxml++/2.40.1/include/libxml++-2.6 -I/usr/local/Cellar/libxml++/2.40.1/lib/libxml++-2.6/include -I/usr/local/Cellar/glibmm/2.54.1/include/glibmm-2.4 -I/usr/local/Cellar/glibmm/2.54.1/lib/glibmm-2.4/include -I/usr/local/Cellar/glib/2.54.2/include/glib-2.0 -I/usr/local/Cellar/glib/2.54.2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.41/include -I/usr/local/Cellar/libsigc++/2.10.0/include/sigc++-2.0 -I/usr/local/Cellar/libsigc++/2.10.0/lib/sigc++-2.0/include -I/usr/include/libxml2 -I/usr/local/Cellar/cairo/1.14.12/include/cairo -I/usr/local/Cellar/glib/2.54.2/include/glib-2.0 -I/usr/local/Cellar/glib/2.54.2/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.41/include -I/usr/local/Cellar/pixman/0.34.0_1/include/pixman-1 -I/usr/local/Cellar/fontconfig/2.12.6/include -I/usr/local/opt/freetype/include/freetype2 -I/usr/local/Cellar/libpng/1.6.37/include/libpng16 -I/usr/local/Cellar/fftw/3.3.6-pl2/include -D_REENTRANT -I/usr/local/Cellar/mlt/6.4.1/include -I/usr/local/Cellar/mlt/6.4.1/include/mlt++ -I/usr/local/Cellar/mlt/6.4.1/include -I/usr/local/Cellar/mlt/6.4.1/include/mlt -I/Users/admin/sources/synfig/ETL -I/Users/admin/sources/synfig/_production/build/include/ETL -I/usr/local/Cellar/libsigc++/2.10.0/include/sigc++-2.0 -I/usr/local/Cellar/libsigc++/2.10.0/lib/sigc++-2.0/include -DSYNFIG_NO_DEPRECATED -DLOCALEDIR=\"/Users/admin/sources/synfig/_production/build/share/locale\" -DLIBDIR=\"/Users/admin/sources/synfig/_production/build/lib\" -DSYSCONFDIR=\"/Users/admin/sources/synfig/_production/build/etc\" -fdiagnostics-color=always -std=c++11 -O2 -DNDEBUG -W -Wall -MT libsynfig_la-type.lo -MD -MP -MF .deps/libsynfig_la-type.Tpo -c /Users/admin/sources/synfig/synfig-core/src/synfig/type.cpp  -fno-common -DPIC -o .libs/libsynfig_la-type.o
In file included from /Users/admin/sources/synfig/synfig-core/src/synfig/type.cpp:32:
In file included from /Users/admin/sources/synfig/synfig-core/src/synfig/type.h:59:
In file included from /Users/admin/sources/synfig/ETL/ETL/handle:33:
/Users/admin/sources/synfig/ETL/ETL/_handle.h:37:10: fatal error: 'atomic' file not found
#include <atomic>
         ^
1 error generated.
make: *** [libsynfig_la-type.lo] Error 1

@morevnaproject
Copy link
Member

Ugh... maybe this is because I have set export MACOSX_DEPLOYMENT_TARGET=10.5 environment variable...

@ice0
Copy link
Collaborator Author

ice0 commented Jan 31, 2021

Ugh... maybe this is because I have set export MACOSX_DEPLOYMENT_TARGET=10.5 environment variable...

10.5 was released in 2007, so no C++11 features. Can you try with 10.6?

@morevnaproject
Copy link
Member

It worked with MACOSX_DEPLOYMENT_TARGET=10.9 ^__^

ARYA-BHARDWAJ and others added 22 commits February 28, 2021 12:53
* Year is fixed in About dialog

* indentation fixed

* added newline at end of file synfig-studio/src/gui/dialogs/about.cpp

Co-authored-by: Arya <ARYA-BHARDWAJ>
(cherry picked from commit 99a1cde)

# Conflicts:
#	autobuild/msys2/build_mlt.sh
…o their respective modules (synfig#1688)

(cherry picked from commit a583e73)
fix synfig#1713

As a consequence, application shortcuts/hotkeys will only work
when those dialogs are not on focus, but this behaviour
should be expected by user.

(cherry picked from commit 7deb121)
The boolean value set in a given timepoint is kept until
a new waypoint.

As before, it ignores any set of interpolation type.

fix synfig#1825 and synfig#658

(cherry picked from commit 23bf66a)
…n-Latin characters (synfig#1882)

[Synfig Studio/Windows] Fixed problem with non-working plugins when using paths containing non-Latin characters

(cherry picked from commit f7e71c9)
…ons for Palette editor

[Synfig Studio/Windows] Fixed load/save operations for Palette editor

(cherry picked from commit 0bd6fd5)
…ins non-Latin characters (synfig#1924)

(cherry picked from commit 7d68380)
…g throws exception while animating

[Synfig Studio] Fixed crash when frame rendering throws exception while animating

(cherry picked from commit f47d674)
@rodolforg
Copy link
Contributor

Strange macOS error. It looks like g++ wasn't set as c++11 standard

@rodolforg
Copy link
Contributor

Will any other commit pushed to 1.4.1?

@ice0
Copy link
Collaborator Author

ice0 commented Apr 3, 2021

Will any other commit pushed to 1.4.1?

Yes. There are a few commits that only exist on this branch.

@rodolforg
Copy link
Contributor

Nice!

What about the remaining PR marked as backport ? Will still be available to 1.4.1?

@ice0
Copy link
Collaborator Author

ice0 commented Apr 4, 2021

What about the remaining PR marked as backport ? Will still be available to 1.4.1?

Yes. I plan to merge them.

You can check progress here: https://github.com/synfig/synfig/projects/7

@rodolforg
Copy link
Contributor

May I help you somehow?
By making Pull Requests to your ice0:v1.4.1 branch, for example?

@ice0
Copy link
Collaborator Author

ice0 commented Apr 7, 2021

By making Pull Requests to your ice0:v1.4.1 branch, for example?

Sure. This will help a lot.
Also, I think you can commit directly to this branch.

P.S. Just add merged changes to first message, and move it to backported here: https://github.com/synfig/synfig/projects/7

@rodolforg
Copy link
Contributor

rodolforg commented Apr 16, 2021

Missing merged PR labeled as Backport:
#1845 #1968 #1973 #1982 #1977 #1979 #1992 #1995 #1997 #2000 #2033 #2059 #2066 #2071 #2084 #2092 #2102 #1929 #2107 #2109

Missing open PR labeled as Backport:
#1935 #2086

Marked as v1.4.1 milestone only:
#1853

@rodolforg
Copy link
Contributor

Should we merge the Text Layer and Family Font Widget too?

Keyikedalube and others added 5 commits April 16, 2021 13:21
* Improved dialog waypoint UX

* Change arg name 'ok' to 'show_labels'

* Updated func & arg name

* Updated to rodolforg suggestion :)

* Updated Out Interpolation and Continuity mnemonics

* ice0 review update

* rodolforg review update
…1973)

Synfig Studio restores the last position and size of Main Window
on launching.

If user had multiple monitors when closing Synfig last time he used it,
Main Window could be moved to a no-more existent monitor/area
and not be visible.

Some Window Managers (like on MS Windows case) does not prevents
opening a window on a invisible area.

On MS Windows, closing Synfig Studio app in a minified state
moves the window to position (-32000,-32000).

fix synfig#1871
@rodolforg
Copy link
Contributor

@morevnaproject @ice0 should we pick PR "single click for edit parameters of any type" ? #1337

@rodolforg
Copy link
Contributor

rodolforg commented Apr 16, 2021

From the 15 already merged PR, 7 can be picked normally: #1973 #1977 #1982 #2000 #2071 #2084 #2092.

I guess #1845 ice0 ported indirectly.

#1968 'depends' on #1182 and #1880 : Waypoint Dialog improvements: button order, hide TCB parameters when not used, show enum values properly.

#1979 'depends' on #1337/#1351 #1429 #1963 (partially). Benefits: speed up layer tree movements and Single-click to edit value on Parameter Panel.

#1992 'depends' on #1514 . Benefits: better parameter tooltips and don't show scale-type parameters as distance values. BAD NEWS: new strings for translations

If it's ok to include these extra PR, I can handle it. =)

* by 'depends' (between single quotes) I mean it clashes; merging is easier if we merge those PR too.

@rodolforg
Copy link
Contributor

I accidentally saw some Warp layer-related commits aren't in stable. Is it intentional?
cf1df92
(and its predecessors 61ff9b8 3ae388d f44ff0a 34a6856 )

@rodolforg
Copy link
Contributor

rodolforg commented Apr 17, 2021

I vote for including #1173 too XD

@rodolforg
Copy link
Contributor

rodolforg commented Apr 17, 2021

Here I merged all PR I cited except:
#1845 (maybe workaround'ed by 59565a0 and f499287 ?)
#1992 (#1514 – waiting for opinion about merge this or not)
#1997 (we won't ship Widget_FontFamily now)

So, these were merged:
(#1182 #1880) #1968 #1973 #1977 (partial #1963 ) (#1429 #1337 #1351) #1979 #1982 #1995 #2000 #2033 #2059 (#2046 #2001 #2057) #2066 #2071 #2084 #2092 #2102 #1929 #2107 #2109

  • Those inside parenthesis are extra PR I merged (due to the next PR I merged).

I proposed #1173 , the commits related to Widget_FontFamily implementation and Text Layer (fontconfig). (we won't ship Widget_FontFamily now)


I don't know if we should update the Warp Layer (that was renamed to Perspective) (we won't ship it to avoid more tests before release)
I don't know if #1853 helps on stable branch.


PR that aren't merged on master: #1935 #2086


If it's ok with those extra I added, I merge my branch to yours, @ice0 .
If I have to squash some commit, rephrase commit messages to match the PR title, etc., please let me know.

@ice0
Copy link
Collaborator Author

ice0 commented Apr 18, 2021

Should we merge the Text Layer and Family Font Widget too?

It's up to you.
But as for me - I think it is better to backport only critical fixes and move forward with a new release.
Each backported feature must be tested and documented in the changelog, which will increase the time it takes to release the fix.

@rodolforg
Copy link
Contributor

Each backported feature must be tested and documented in the changelog, which will increase the time it takes to release the fix.

Indeed. And I feel it's taking too long for my 'anxiety' :D

@morevnaproject
Copy link
Member

Indeed. And I feel it's taking too long for my 'anxiety' :D

Apologies for that! There is a messy segment around the point where "stable" branch divorced from "master" - at this time we were used to commit directly to master (without PRs) and this makes hard to track items for ChangeLog. It took time to sort out this mess. ^__^"

I think it is better to backport only critical fixes and move forward with a new release.

I also agree with that.

Should we merge the Text Layer and Family Font Widget too?

In the past I have made an attempt to do that, but we have hit problems with fontconfig version shipped in Appimage. So, this will require some additional work and tests.

I am proposing the following plan:

  • Merge current PR into 1.4.x branch and release 1.4.1 ASAP (I think we are ready for that).
  • After that merge the branch made by @rodolforg and release it as 1.4.2 (I expect it to be merged into 1.4.x through separate PR).
  • After that I would like to merge into 1.4.x all features from master branch up to this commit - 70c851e. This includes reworked Warp Layer, New timetrack. This is expected to become 1.4.3. At this point we will pass the messy segment when we used to commit into master without PRs, and after that it will be easier to generate ChangeLogs and do releases faster.
  • Finally, after that we can concentrate on preparing release of 1.5.0.

How about this? ^__^

@rodolforg
Copy link
Contributor

rodolforg commented Apr 19, 2021

Merge current PR into 1.4.x branch and release 1.4.1 ASAP (I think we are ready for that).

Great! :)

After that merge the branch made by @rodolforg and release it as 1.4.2 (I expect it to be merged into 1.4.x through separate PR).

I suggest to merge at least (#1182 #1880) #1968 #1973 #1977 before release.

  1. It bumps the year to current one lol
  2. Avoid the constant complaining about Synfig doesn't open anymore on Windows (it's happening quite often recently on forum and here)
  3. And it follows the PR order lol

@morevnaproject
Copy link
Member

I suggest to merge at least (#1182 #1880) #1968 #1973 #1977 before release.

1. It bumps the year to current one lol

2. Avoid the constant complaining about Synfig doesn't open anymore on Windows (it's happening quite often recently on forum and here)

3. And it follows the PR order lol

Added to this PR. Thank you! ^__^

@morevnaproject morevnaproject merged commit aebb432 into synfig:v1.4.x Apr 20, 2021
@lgtm-com
Copy link

lgtm-com bot commented Apr 20, 2021

This pull request introduces 2 alerts when merging fbb74ac into 383fcf8 - view on LGTM.com

new alerts:

  • 2 for FIXME comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants